chrome/browser/ui/ash/system_tray_delegate_chromeos.cc - Issue 2148593004: mash: Move StatusTray and StatusAreaWidget 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: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

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

« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | chrome/browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

index 4dce95b19e0c8dcfdd27302abef7d3881ecaaff9..fa81d504c846b7b71d63866b266c1c73e4fc23fa 100644

--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

@@ -24,6 +24,7 @@

#include "ash/common/system/chromeos/shutdown_policy_observer.h"

#include "ash/common/system/date/clock_observer.h"

#include "ash/common/system/ime/ime_observer.h"

+#include "ash/common/system/tray/system_tray.h"

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

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

#include "ash/common/system/tray_accessibility.h"

@@ -35,7 +36,6 @@

#include "ash/shell.h"

#include "ash/system/chromeos/rotation/tray_rotation_lock.h"

#include "ash/system/chromeos/tray_display.h"

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

#include "ash/wm/lock_state_controller.h"

#include "base/bind_helpers.h"

#include "base/callback.h"