ash/shelf/shelf_layout_manager.h - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

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 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: Created 3 years, 9 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 9ff211b79fc97c9746878c454e05bd4ffa680d50..505cf0ee540d5457060ecbd9fa190cef56f23423 100644

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

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

@@ -8,15 +8,15 @@

#include <memory>

#include "ash/ash_export.h"

+#include "ash/common/session/session_state_observer.h"

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

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

#include "ash/public/cpp/shelf_types.h"

-#include "ash/session/session_state_observer.h"

#include "ash/shelf/wm_shelf.h"

-#include "ash/shell_observer.h"

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

#include "ash/wm/lock_state_observer.h"

#include "ash/wm/wm_snap_to_pixel_layout_manager.h"

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

-#include "ash/wm_activation_observer.h"

#include "base/macros.h"

#include "base/observer_list.h"

#include "base/timer/timer.h"

« no previous file with comments | « ash/shelf/shelf_controller.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »