ash/system/tray/system_tray.cc - Issue 2109613005: mash: Move system tray cast code into //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 2109613005: mash: Move system tray cast code into //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: forward decl 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/system/tray/system_tray.cc

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

index 35227cb0f4bc85a16dd6dff3989d8434143a9bf0..e3c58bb96b01085207451b5a811dc11d8d83f49d 100644

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

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

@@ -10,6 +10,7 @@

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

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

#include "ash/common/shell_window_ids.h"

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

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

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

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

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

#include "ash/common/wm_root_window_controller.h"

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

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

#include "ash/system/user/tray_user.h"

#include "base/logging.h"

#include "base/metrics/histogram.h"

@@ -46,6 +46,8 @@

#if defined(OS_CHROMEOS)

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

#include "ash/common/system/chromeos/power/tray_power.h"

+#include "ash/common/system/chromeos/screen_security/screen_capture_tray_item.h"

+#include "ash/common/system/chromeos/screen_security/screen_share_tray_item.h"

#include "ash/common/system/chromeos/session/tray_session_length_limit.h"

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

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

@@ -59,8 +61,6 @@

#include "ash/system/chromeos/network/tray_sms.h"

#include "ash/system/chromeos/network/tray_vpn.h"

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

-#include "ash/system/chromeos/screen_security/screen_capture_tray_item.h"

-#include "ash/system/chromeos/screen_security/screen_share_tray_item.h"

#include "ash/system/chromeos/supervised/tray_supervised_user.h"

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

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

« no previous file with comments | « ash/system/tray/system_tray.h ('k') | ash/test/tray_cast_test_api.h » ('j') | no next file with comments »