ash/shell.cc - Issue 2108403004: mash: Move several chromeos system tray items 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/shell.cc

Issue 2108403004: mash: Move several chromeos system tray items to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@audio

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/common/system/chromeos/tray_caps_lock.cc ('k') | ash/system/chromeos/bluetooth/bluetooth_notification_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/shell.cc

diff --git a/ash/shell.cc b/ash/shell.cc

index 1e8fa641c5f25df29c9a9d14fd20e39c720d3dc5..57993d5a7a9a7d0197da1222718ca8f9eaa41ea6 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -125,6 +125,7 @@

#include "ash/accelerators/magnifier_key_scroller.h"

#include "ash/accelerators/spoken_feedback_toggler.h"

#include "ash/common/ash_constants.h"

+#include "ash/common/system/chromeos/bluetooth/bluetooth_notification_controller.h"

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

#include "ash/display/display_change_observer_chromeos.h"

#include "ash/display/display_color_manager_chromeos.h"

@@ -133,7 +134,6 @@

#include "ash/display/resolution_notification_controller.h"

#include "ash/display/screen_orientation_controller_chromeos.h"

#include "ash/sticky_keys/sticky_keys_controller.h"

-#include "ash/system/chromeos/bluetooth/bluetooth_notification_controller.h"

#include "ash/system/chromeos/brightness/brightness_controller_chromeos.h"

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

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

« no previous file with comments | « ash/common/system/chromeos/tray_caps_lock.cc ('k') | ash/system/chromeos/bluetooth/bluetooth_notification_controller.h » ('j') | no next file with comments »