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

Unified Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

Issue 2906803002: Rename MaximizeMode to TabletMode (Closed)
Patch Set: updated filter 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: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
index 18c2b4596da5e27f26aff2cf58a30f0ecb948c4a..6f698e02e7b3c574baf3d5f5912cc3d0f933d3c2 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
@@ -9,7 +9,7 @@
#include "ash/frame/header_painter.h"
#include "ash/shell.h"
#include "ash/test/immersive_fullscreen_controller_test_api.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/wm/tablet_mode/tablet_mode_controller.h"
#include "base/command_line.h"
#include "build/build_config.h"
#include "chrome/browser/profiles/profile_avatar_icon_util.h"
@@ -263,9 +263,9 @@ IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest,
}
// Tests that FrameCaptionButtonContainer has been relaid out in response to
-// maximize mode being toggled.
+// tablet mode being toggled.
IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest,
- ToggleMaximizeModeRelayout) {
+ ToggleTabletModeRelayout) {
BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
Widget* widget = browser_view->GetWidget();
// We know we're using Ash, so static cast.
@@ -274,18 +274,16 @@ IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest,
widget->non_client_view()->frame_view());
const gfx::Rect initial = frame_view->caption_button_container_->bounds();
- ash::Shell::Get()
- ->maximize_mode_controller()
- ->EnableMaximizeModeWindowManager(true);
+ ash::Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(
+ true);
ash::FrameCaptionButtonContainerView::TestApi test(frame_view->
caption_button_container_);
test.EndAnimations();
const gfx::Rect during_maximize = frame_view->caption_button_container_->
bounds();
EXPECT_GT(initial.width(), during_maximize.width());
- ash::Shell::Get()
- ->maximize_mode_controller()
- ->EnableMaximizeModeWindowManager(false);
+ ash::Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(
+ false);
test.EndAnimations();
const gfx::Rect after_restore = frame_view->caption_button_container_->
bounds();

Powered by Google App Engine
This is Rietveld 408576698