ash/accelerators/accelerator_controller.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.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:

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 e93911ce84cd3123a748013654553167339c02de..21eda7d2f2714c5b5edfe86864a4d8240fbb4e7e 100644

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

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

@@ -9,20 +9,22 @@

#include "ash/accelerators/accelerator_commands.h"

#include "ash/accelerators/accelerator_controller_delegate.h"

#include "ash/accelerators/debug_commands.h"

-#include "ash/accessibility_delegate.h"

-#include "ash/accessibility_types.h"

-#include "ash/focus_cycler.h"

-#include "ash/ime_control_delegate.h"

-#include "ash/media_controller.h"

-#include "ash/multi_profile_uma.h"

-#include "ash/new_window_controller.h"

-#include "ash/palette_delegate.h"

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

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

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

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

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

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

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

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

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

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

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

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

#include "ash/resources/vector_icons/vector_icons.h"

#include "ash/root_window_controller.h"

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

#include "ash/shelf/shelf_widget.h"

#include "ash/shelf/wm_shelf.h"

-#include "ash/shell_delegate.h"

#include "ash/strings/grit/ash_strings.h"

#include "ash/system/brightness_control_delegate.h"

#include "ash/system/ime_menu/ime_menu_tray.h"

@@ -40,8 +42,6 @@

#include "ash/wm/window_positioning_utils.h"

#include "ash/wm/window_state.h"

#include "ash/wm/wm_event.h"

-#include "ash/wm_shell.h"

-#include "ash/wm_window.h"

#include "base/metrics/histogram_macros.h"

#include "base/metrics/user_metrics.h"

#include "chromeos/dbus/dbus_thread_manager.h"

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