commit db9131601d13e57554df51916199eba371b7264b
author ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Feb 29 19:06:32 2012
committer ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Feb 29 19:06:32 2012
tree 28726f42e5ab82c95ff79a0167e1d71ab9682959
parent f56b47dc4f7b68cd627d8cb874879bf80e01e50d

Convert a bunch of AuraTestBase users to AshTestBase.

http://crbug.com/112131
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9522012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124220 0039d316-1c4b-4281-b951-d872f2087c98

ash/shell.cc

diff --git a/ash/shell.cc b/ash/shell.cc
index 4eb8a21..8f930698 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -239,6 +239,14 @@
   return shell_->root_window_layout_;
 }
 
+internal::InputMethodEventFilter* Shell::TestApi::input_method_event_filter() {
+  return shell_->input_method_filter_.get();
+}
+
+internal::WorkspaceController* Shell::TestApi::workspace_controller() {
+  return shell_->workspace_controller_.get();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, public:
 
@@ -353,7 +361,8 @@
 
   // Window mode must be set before computing containers or layout managers.
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-  window_mode_ = ComputeWindowMode(command_line);
+  if (!delegate_.get() || !delegate_->GetOverrideWindowMode(&window_mode_))
+    window_mode_ = ComputeWindowMode(command_line);
 
   aura::RootWindow* root_window = GetRootWindow();
   root_window->SetCursor(aura::kCursorPointer);