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

Unified Diff: ash/frame/custom_frame_view_ash_unittest.cc

Issue 2113053003: Moves Shell::maximize_mode_controller() to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: order Created 4 years, 6 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: ash/frame/custom_frame_view_ash_unittest.cc
diff --git a/ash/frame/custom_frame_view_ash_unittest.cc b/ash/frame/custom_frame_view_ash_unittest.cc
index c1b7e0d8582c9ad94239a5b90c4a5dde44ffb53e..bfcd11447da02365e75bdcda8d2ae52ca2c39add 100644
--- a/ash/frame/custom_frame_view_ash_unittest.cc
+++ b/ash/frame/custom_frame_view_ash_unittest.cc
@@ -207,16 +207,14 @@ TEST_F(CustomFrameViewAshTest, HeaderViewNotifiedOfChildSizeChange) {
const gfx::Rect initial =
delegate->GetFrameCaptionButtonContainerViewBounds();
- Shell::GetInstance()
- ->maximize_mode_controller()
- ->EnableMaximizeModeWindowManager(true);
+ WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+ true);
delegate->EndFrameCaptionButtonContainerViewAnimations();
const gfx::Rect maximize_mode_bounds =
delegate->GetFrameCaptionButtonContainerViewBounds();
EXPECT_GT(initial.width(), maximize_mode_bounds.width());
- Shell::GetInstance()
- ->maximize_mode_controller()
- ->EnableMaximizeModeWindowManager(false);
+ WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+ false);
delegate->EndFrameCaptionButtonContainerViewAnimations();
const gfx::Rect after_restore =
delegate->GetFrameCaptionButtonContainerViewBounds();
« no previous file with comments | « ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698