ash/shelf/shelf_layout_manager.cc - Issue 2166043003: mash: Migrate ShelfLockingManager to ash/common.

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/shelf/shelf_layout_manager.cc

Issue 2166043003: mash: Migrate ShelfLockingManager to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move ShelfLockingManager test access to Shelf. Created 4 years, 5 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/shelf/shelf_layout_manager.cc

diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc

index d89ffb22ce78178bb9a30a3f6e0ad4d961969b40..293477de40a3860ce43893c4a05e32b25394b474 100644

--- a/ash/shelf/shelf_layout_manager.cc

+++ b/ash/shelf/shelf_layout_manager.cc

@@ -34,7 +34,6 @@

#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

#include "ash/wm/gestures/shelf_gesture_handler.h"

-#include "ash/wm/lock_state_controller.h"

#include "ash/wm/window_animations.h"

#include "ash/wm/window_state_aura.h"

#include "ash/wm/window_util.h"

@@ -222,7 +221,7 @@ ShelfLayoutManager::ShelfLayoutManager(ShelfWidget* shelf_widget)

->GetRootWindowController()

->AddObserver(root_window_controller_observer_.get());

}

- Shell::GetInstance()->lock_state_controller()->AddObserver(this);

+ WmShell::Get()->AddLockStateObserver(this);

aura::client::GetActivationClient(root_window_)->AddObserver(this);

WmShell::Get()->GetSessionStateDelegate()->AddSessionStateObserver(this);

}

@@ -234,7 +233,7 @@ ShelfLayoutManager::~ShelfLayoutManager() {

FOR_EACH_OBSERVER(ShelfLayoutManagerObserver, observers_,

WillDeleteShelfLayoutManager());

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

- Shell::GetInstance()->lock_state_controller()->RemoveObserver(this);

+ WmShell::Get()->RemoveLockStateObserver(this);

WmShell::Get()->GetSessionStateDelegate()->RemoveSessionStateObserver(

this);

if (root_window_controller_observer_) {