ash/accelerators/accelerator_controller.cc - Issue 2072013002: mash: Move tray settings and deps to 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/accelerators/accelerator_controller.cc

Issue 2072013002: mash: Move tray settings and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Undo 'git cl format' and nullptr changes. 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:

Index: ash/accelerators/accelerator_controller.cc

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc

index 76f68db4b14eced93cb33460747d9f9740ae7ea7..ab56db668e2f8bbdb44f36ac76352ae5c5001b02 100644

--- a/ash/accelerators/accelerator_controller.cc

+++ b/ash/accelerators/accelerator_controller.cc

@@ -15,6 +15,7 @@

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

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

#include "ash/common/shell_window_ids.h"

+#include "ash/common/system/system_notifier.h"

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

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

#include "ash/common/wm/mru_window_tracker.h"

@@ -44,7 +45,6 @@

#include "ash/system/brightness_control_delegate.h"

#include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h"

#include "ash/system/status_area_widget.h"

-#include "ash/system/system_notifier.h"

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

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

#include "ash/system/web_notification/web_notification_tray.h"

« no previous file with comments | « no previous file | ash/ash.gyp » ('j') | ash/common/DEPS » ('J')