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

Unified Diff: ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc

Issue 2909763002: Revert of Rename MaximizeMode to TabletMode (Closed)
Patch Set: Created 3 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: 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 e2f25281a4ac6dc0bd24db8a442dda794882dd15..4b4e5e2877f8c25c66a4c8636a714d7e8743f900 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
@@ -10,7 +10,7 @@
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/tablet_mode/tablet_mode_controller.h"
+#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
@@ -165,7 +165,8 @@
// 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::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(true);
+ Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+ true);
container.UpdateSizeButtonVisibility();
test.EndAnimations();
// Parent needs to layout in response to size change.
@@ -184,7 +185,8 @@
// Revealing the size button should cause the minimize button to return to its
// original position.
- Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(false);
+ Shell::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