ash/accelerators/accelerator_controller.cc - Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces 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 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel

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 7e35800cada1ae8ea4b73ec418e3a60cc5e21d63..956c245da227cd92db7470716213b4057335f9de 100644

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

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

@@ -12,18 +12,20 @@

#include "ash/accelerators/accelerator_commands.h"

#include "ash/accelerators/debug_commands.h"

#include "ash/ash_switches.h"

+#include "ash/common/gpu_support.h"

+#include "ash/common/media_delegate.h"

+#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/volume_control_delegate.h"

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

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

#include "ash/debug.h"

#include "ash/display/window_tree_host_manager.h"

#include "ash/focus_cycler.h"

-#include "ash/gpu_support.h"

#include "ash/ime_control_delegate.h"

#include "ash/magnifier/magnification_controller.h"

#include "ash/magnifier/partial_magnification_controller.h"

-#include "ash/media_delegate.h"

#include "ash/multi_profile_uma.h"

#include "ash/new_window_delegate.h"

#include "ash/root_window_controller.h"

@@ -31,7 +33,6 @@

#include "ash/rotator/window_rotation.h"

#include "ash/screen_util.h"

#include "ash/screenshot_delegate.h"

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

#include "ash/shelf/shelf.h"

#include "ash/shelf/shelf_delegate.h"

#include "ash/shelf/shelf_widget.h"

@@ -47,7 +48,6 @@

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

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

« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller_unittest.cc » ('j') | ash/common/session/session_state_delegate.h » ('J')