ash/common/shelf/shelf_layout_manager.h - Issue 2376103005: mustash: Break dependency of //ash/public/interfaces on //ash

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

Issue 2376103005: mustash: Break dependency of //ash/public/interfaces on //ash (Closed)

Patch Set: rebase Created 4 years, 3 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/common/shelf/shelf_layout_manager.h

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

index df7b0f7e4b72f67a962d4f11c04473fc6aefc064..141b40c37506a6ba520ae7d0563fda0abab43420 100644

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

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

@@ -9,7 +9,6 @@

#include "ash/ash_export.h"

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

-#include "ash/common/shelf/shelf_types.h"

#include "ash/common/shelf/shelf_widget.h"

#include "ash/common/shell_observer.h"

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

@@ -19,6 +18,7 @@

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

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

#include "ash/common/wm_activation_observer.h"

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

#include "base/macros.h"

#include "base/observer_list.h"

#include "base/timer/timer.h"