chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc - Issue 2905383003: (fix landed) Reland of name MaximizeMode to TabletMode

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2905383003: (fix landed) Reland of name 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

index dd6b16f646a2f1e168052d48a1c3186234495b95..67cd0a800cc9144d59f3b716afc4bd7a673d56ef 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

@@ -27,7 +27,7 @@

#include "ash/test/ash_test_helper.h"

#include "ash/test/shell_test_api.h"

#include "ash/test/test_shell_delegate.h"

-#include "ash/wm/maximize_mode/maximize_mode_controller.h"

+#include "ash/wm/tablet_mode/tablet_mode_controller.h"

#include "ash/wm/window_util.h"

#include "base/command_line.h"

#include "base/compiler_specific.h"

@@ -960,9 +960,9 @@

}

void EnableTabletMode(bool enable) {

- ash::MaximizeModeController* controller =

- ash::Shell::Get()->maximize_mode_controller();

- controller->EnableMaximizeModeWindowManager(enable);

+ ash::TabletModeController* controller =

+ ash::Shell::Get()->tablet_mode_controller();

+ controller->EnableTabletModeWindowManager(enable);

}

void ValidateArcState(bool arc_enabled,