ash/system/chromeos/rotation/tray_rotation_lock.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: ash/system/chromeos/rotation/tray_rotation_lock.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:

Index: ash/system/chromeos/rotation/tray_rotation_lock.cc

diff --git a/ash/system/chromeos/rotation/tray_rotation_lock.cc b/ash/system/chromeos/rotation/tray_rotation_lock.cc

index 07bdef53615fc6fda974965eebe43e1c1c53c158..aa1e4b913f46451a51038352779a14c1fd56a66c 100644

--- a/ash/system/chromeos/rotation/tray_rotation_lock.cc

+++ b/ash/system/chromeos/rotation/tray_rotation_lock.cc

@@ -45,7 +45,7 @@ class RotationLockDefaultView : public TrayItemMore, public ShellObserver {

RotationLockDefaultView::RotationLockDefaultView(SystemTrayItem* owner)

: TrayItemMore(owner, false) {

UpdateImage();

- SetVisible(Shell::GetInstance()

+ SetVisible(WmShell::Get()

->maximize_mode_controller()

->IsMaximizeModeWindowManagerEnabled());

WmShell::Get()->AddShellObserver(this);

@@ -140,7 +140,7 @@ bool TrayRotationLock::GetInitialVisibility() {

bool TrayRotationLock::ShouldBeVisible() {

return OnPrimaryDisplay() &&

- Shell::GetInstance()

+ WmShell::Get()

->maximize_mode_controller()

->IsMaximizeModeWindowManagerEnabled() &&

Shell::GetInstance()