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

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.h

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

index 5696b6928b22c6d668bdf98276e1898bb1eb93ee..f68995f497ff7d6398e241acb0ecb0dfba591fa5 100644

--- a/ash/shelf/shelf_layout_manager.h

+++ b/ash/shelf/shelf_layout_manager.h

@@ -15,11 +15,11 @@

#include "ash/common/system/status_area_widget.h"

#include "ash/common/wm/background_animator.h"

#include "ash/common/wm/dock/docked_window_layout_manager_observer.h"

+#include "ash/common/wm/lock_state_observer.h"

#include "ash/common/wm/workspace/workspace_types.h"

#include "ash/shelf/shelf.h"

#include "ash/snap_to_pixel_layout_manager.h"

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

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

#include "base/compiler_specific.h"

#include "base/gtest_prod_util.h"

#include "base/logging.h"