chrome/browser/extensions/display_info_provider_chromeos_unittest.cc - Issue 2113053003: Moves Shell::maximize_mode_controller() to WmShell

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/extensions/display_info_provider_chromeos_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

« no previous file with comments | « chrome/browser/chromeos/display/display_preferences_unittest.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/extensions/display_info_provider_chromeos_unittest.cc

diff --git a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc

index adbe305dabfcf5e8faab31e786a3466ae7124a1f..757a1c92c139a6efb415aa73e12e8b52bffed1be 100644

--- a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc

+++ b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc

@@ -8,6 +8,7 @@

#include "ash/common/ash_switches.h"

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

+#include "ash/common/wm_shell.h"

#include "ash/display/display_manager.h"

#include "ash/display/screen_orientation_controller_chromeos.h"

#include "ash/screen_util.h"

@@ -916,7 +917,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotationBeforeMaximizeMode) {

EXPECT_FALSE(screen_orientation_controller->rotation_locked());

// Entering maximize mode enables accelerometer screen rotations.

- ash::Shell::GetInstance()

+ ash::WmShell::Get()

->maximize_mode_controller()

->EnableMaximizeModeWindowManager(true);

// Rotation lock should not activate because DisplayInfoProvider::SetInfo()

@@ -929,7 +930,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotationBeforeMaximizeMode) {

EXPECT_EQ(display::Display::ROTATE_0, GetCurrentInternalDisplayRotation());

// Exiting maximize mode should restore the initial rotation

- ash::Shell::GetInstance()

+ ash::WmShell::Get()

->maximize_mode_controller()

->EnableMaximizeModeWindowManager(false);

EXPECT_EQ(display::Display::ROTATE_90, GetCurrentInternalDisplayRotation());

@@ -939,7 +940,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotationBeforeMaximizeMode) {

// against accelerometer rotations.

TEST_F(DisplayInfoProviderChromeosTest, SetRotationDuringMaximizeMode) {

// Entering maximize mode enables accelerometer screen rotations.

- ash::Shell::GetInstance()

+ ash::WmShell::Get()

->maximize_mode_controller()

->EnableMaximizeModeWindowManager(true);