summaryrefslogtreecommitdiffstats
path: root/ash/test
diff options
context:
space:
mode:
authorjonross@chromium.org <jonross@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-09 20:02:26 +0000
committerjonross@chromium.org <jonross@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-09 20:02:26 +0000
commit2a57beb531db01d470431e842dc02645e7ab760e (patch)
treeae00ace44801238edbdbdd2d18e7004366dc03cd /ash/test
parentb16565566a248a52352a5793743779d7ae89f5a1 (diff)
downloadchromium_src-2a57beb531db01d470431e842dc02645e7ab760e.zip
chromium_src-2a57beb531db01d470431e842dc02645e7ab760e.tar.gz
chromium_src-2a57beb531db01d470431e842dc02645e7ab760e.tar.bz2
Move MaximizeModeWindowManager to the controller
Remove MaximizeModeWindowManager from Shell. Place it within MaximizeModeController. Move notifications to ShellObserver to after the creation of the window manager. This way checks for it being enabled are correct during notifications. Update all files that were working around this deficiency. TEST=MaximizeModeController Review URL: https://codereview.chromium.org/308683002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275843 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
-rw-r--r--ash/test/shell_test_api.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/ash/test/shell_test_api.cc b/ash/test/shell_test_api.cc
index 0a7d4fd..94d93e5 100644
--- a/ash/test/shell_test_api.cc
+++ b/ash/test/shell_test_api.cc
@@ -55,10 +55,6 @@ AppListController* ShellTestApi::app_list_controller() {
return shell_->app_list_controller_.get();
}
-MaximizeModeWindowManager* ShellTestApi::maximize_mode_window_manager() {
- return shell_->maximize_mode_window_manager_.get();
-}
-
void ShellTestApi::DisableDisplayConfiguratorAnimation() {
#if defined(OS_CHROMEOS)
if (shell_->display_configurator_animation_) {