ash/system/chromeos/settings/tray_settings.cc - Issue 2066583004: mash: Move most files in //ash/system/tray to //ash/common/system/tray

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/chromeos/settings/tray_settings.cc

Issue 2066583004: mash: Move most files in //ash/system/tray to //ash/common/system/tray (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trayupdatemove

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

« no previous file with comments | « ash/system/chromeos/screen_security/screen_tray_item.h ('k') | ash/system/chromeos/supervised/tray_supervised_user.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/system/chromeos/settings/tray_settings.cc

diff --git a/ash/system/chromeos/settings/tray_settings.cc b/ash/system/chromeos/settings/tray_settings.cc

index ecc20bcc038766794073cf4898b0f45bbcaf2c2b..5c1ce9b75763a360b3844ab5ca670ff3dbddacff 100644

--- a/ash/system/chromeos/settings/tray_settings.cc

+++ b/ash/system/chromeos/settings/tray_settings.cc

@@ -5,6 +5,7 @@

#include "ash/system/chromeos/settings/tray_settings.h"

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

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

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

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

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

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

#include "ash/shell.h"

#include "ash/system/chromeos/power/power_status.h"

#include "ash/system/chromeos/power/power_status_view.h"

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

#include "base/logging.h"

#include "base/strings/utf_string_conversions.h"

#include "grit/ash_resources.h"

« no previous file with comments | « ash/system/chromeos/screen_security/screen_tray_item.h ('k') | ash/system/chromeos/supervised/tray_supervised_user.h » ('j') | no next file with comments »