Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1078)

Unified Diff: chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc

Issue 308683002: Move MaximizeModeWindowManager to the controller (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
index 4250223b98058939eb33532d4779a5431fe3d6e5..6c79cdf979eea3fabb3ce03340d53ccfbfb4f178 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
@@ -9,6 +9,7 @@
#include "ash/shelf/shelf_model.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
+#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/prefs/pref_service.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
@@ -118,14 +119,16 @@ TEST_F(LauncherContextMenuTest, NoAutoHideOptionInMaximizedMode) {
ASSERT_TRUE(IsItemPresentInMenu(
menu.get(), LauncherContextMenu::MENU_AUTO_HIDE));
}
- ash::Shell::GetInstance()->EnableMaximizeModeWindowManager(true);
+ ash::Shell::GetInstance()->maximize_mode_controller()->
+ EnableMaximizeModeWindowManager(true);
{
scoped_ptr<LauncherContextMenu> menu(
CreateLauncherContextMenu(ash::TYPE_BROWSER_SHORTCUT));
ASSERT_FALSE(IsItemPresentInMenu(
menu.get(), LauncherContextMenu::MENU_AUTO_HIDE));
}
- ash::Shell::GetInstance()->EnableMaximizeModeWindowManager(false);
+ ash::Shell::GetInstance()->maximize_mode_controller()->
+ EnableMaximizeModeWindowManager(false);
{
scoped_ptr<LauncherContextMenu> menu(
CreateLauncherContextMenu(ash::TYPE_BROWSER_SHORTCUT));

Powered by Google App Engine
This is Rietveld 408576698