ash/shelf/shelf_widget.cc - Issue 2187513003: mash: Partially migrate ShelfLayoutManager to ash common types.

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_widget.cc

Issue 2187513003: mash: Partially migrate ShelfLayoutManager to ash common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and rebase. 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:

View side-by-side diff with in-line comments

Download patch

Index: ash/shelf/shelf_widget.cc

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

index e974ccaaae037ee66d81a10d8337fae5d119345a..0b986a38b947c47dc1f83a0c9218f75998244855 100644

--- a/ash/shelf/shelf_widget.cc

+++ b/ash/shelf/shelf_widget.cc

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

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

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

#include "ash/common/shell_window_ids.h"

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

#include "ash/common/system/tray/system_tray_delegate.h"

#include "ash/common/wm_root_window_controller.h"

#include "ash/common/wm_shell.h"

+#include "ash/shelf/shelf.h"

#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shelf/shelf_util.h"

#include "ash/shelf/shelf_view.h"

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