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

Unified Diff: ash/frame/caption_buttons/frame_caption_button_container_view_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/caption_buttons/frame_caption_button_container_view_unittest.cc
diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc b/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
index 12f48ad040fdef69b2c20dc895fb2814bfb6ed14..d8b5c6027e74e138afdf6fbdc1a293912f454a0f 100644
--- a/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
+++ b/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
@@ -6,6 +6,7 @@
#include "ash/common/ash_layout_constants.h"
#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm_shell.h"
#include "ash/frame/caption_buttons/frame_caption_button.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
@@ -165,9 +166,8 @@ TEST_F(FrameCaptionButtonContainerViewTest,
// Hidden size button should result in minimize button animating to the
// right. The size button should not be visible, but should not have moved.
- Shell::GetInstance()
- ->maximize_mode_controller()
- ->EnableMaximizeModeWindowManager(true);
+ WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+ true);
container.UpdateSizeButtonVisibility();
test.EndAnimations();
// Parent needs to layout in response to size change.
@@ -186,9 +186,8 @@ TEST_F(FrameCaptionButtonContainerViewTest,
// Revealing the size button should cause the minimize button to return to its
// original position.
- Shell::GetInstance()
- ->maximize_mode_controller()
- ->EnableMaximizeModeWindowManager(false);
+ WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+ false);
container.UpdateSizeButtonVisibility();
// Calling code needs to layout in response to size change.
container.Layout();
« no previous file with comments | « ash/frame/caption_buttons/frame_caption_button_container_view.cc ('k') | ash/frame/custom_frame_view_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698