ash/accelerators/accelerator_controller.cc - Issue 2056823002: mash: Move SystemTrayDelegate and dependencies 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/accelerators/accelerator_controller.cc

Issue 2056823002: mash: Move SystemTrayDelegate and dependencies to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/accelerators/accelerator_controller.cc

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

index ee10d8c90425f0092157e8a8071cf7fec7202d79..cfb66bf2cce5b1cd930aa0bc1239b6a70576f5e2 100644

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

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

@@ -15,6 +15,8 @@

#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/tray/system_tray_delegate.h"

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

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

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

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

@@ -43,12 +45,10 @@

#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_delegate.h"

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

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

#include "ash/touch/touch_hud_debug.h"

#include "ash/utility/screenshot_controller.h"

-#include "ash/volume_control_delegate.h"

#include "ash/wm/maximize_mode/maximize_mode_controller.h"

#include "ash/wm/overview/window_selector_controller.h"

#include "ash/wm/power_button_controller.h"

« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller_unittest.cc » ('j') | no next file with comments »