ash/system/tray/system_tray.cc - Issue 2063813002: mash: Move SystemTrayImage and TrayImageItem 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/system/tray/system_tray.cc

Issue 2063813002: mash: Move SystemTrayImage and TrayImageItem to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wmnotifier

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

« ash/common/system/tray/DEPS ('K') | « ash/system/tray/media_security/multi_profile_media_tray_item_unittest.cc ('k') | ash/system/tray/system_tray_bubble.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/system/tray/system_tray.cc

diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc

index 258b5a8ad0979bb33400a48edb256d1464709ce3..472b6eec9d6c805e4f2c91438daf3c906a0935b1 100644

--- a/ash/system/tray/system_tray.cc

+++ b/ash/system/tray/system_tray.cc

@@ -8,6 +8,7 @@

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

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

#include "ash/common/wm_shell.h"

#include "ash/metrics/user_metrics_recorder.h"

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

#include "ash/system/cast/tray_cast.h"

#include "ash/system/date/tray_date.h"

#include "ash/system/status_area_widget.h"

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

#include "ash/system/tray/tray_bubble_wrapper.h"

#include "ash/system/tray_accessibility.h"

#include "ash/system/tray_update.h"