ash/accelerators/accelerator_controller_delegate_aura.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

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_delegate_aura.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: Created 3 years, 9 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_delegate_aura.cc

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

index db6fd67a7a1754b8a0ab4f3bf3b0222bb201010e..9fddcad0e20752677800d47c73fd4513ac55bcea 100644

--- a/ash/accelerators/accelerator_controller_delegate_aura.cc

+++ b/ash/accelerators/accelerator_controller_delegate_aura.cc

@@ -11,7 +11,10 @@

#include "ash/accelerators/accelerator_commands_aura.h"

#include "ash/accelerators/debug_commands.h"

-#include "ash/accessibility_types.h"

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

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

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

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

#include "ash/debug.h"

#include "ash/display/display_configuration_controller.h"

#include "ash/display/window_tree_host_manager.h"

@@ -21,10 +24,8 @@

#include "ash/root_window_controller.h"

#include "ash/rotator/window_rotation.h"

#include "ash/screenshot_delegate.h"

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

#include "ash/shelf/wm_shelf.h"

#include "ash/shell.h"

-#include "ash/shell_delegate.h"

#include "ash/system/system_notifier.h"

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

#include "ash/touch/touch_hud_debug.h"

@@ -35,7 +36,6 @@

#include "ash/wm/window_state_aura.h"

#include "ash/wm/window_util.h"

#include "ash/wm/wm_event.h"

-#include "ash/wm_shell.h"

#include "base/memory/ptr_util.h"

#include "base/metrics/histogram_macros.h"

#include "base/metrics/user_metrics.h"