ash/shelf/shelf_widget.cc - Issue 2056823002: mash: Move SystemTrayDelegate and dependencies 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_widget.cc

Issue 2056823002: mash: Move SystemTrayDelegate and dependencies to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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 37f63de6e639c1fbca81d84c3cf3b236684d8469..8430737e27f74692fefb5136085496330b86ff25 100644

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

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

@@ -13,6 +13,7 @@

#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/tray/system_tray_delegate.h"

#include "ash/common/wm_root_window_controller.h"

#include "ash/focus_cycler.h"

#include "ash/shelf/shelf_delegate.h"

@@ -21,7 +22,6 @@

#include "ash/shelf/shelf_util.h"

#include "ash/shelf/shelf_view.h"

#include "ash/shell.h"

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

#include "ash/wm/status_area_layout_manager.h"

#include "ash/wm/window_properties.h"

#include "ash/wm/workspace_controller.h"

« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »