ash/common/accelerators/accelerator_controller.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

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/common/accelerators/accelerator_controller.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

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

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

index 52e33dd9981ed584f1f5d09879d93c634efba0bb..0fdc14d409711e66ea337202aba96aca89e1959d 100644

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

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

@@ -21,16 +21,6 @@

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

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

#include "ash/common/shell_delegate.h"

-#include "ash/common/system/brightness_control_delegate.h"

-#include "ash/common/system/chromeos/ime_menu/ime_menu_tray.h"

-#include "ash/common/system/chromeos/palette/palette_tray.h"

-#include "ash/common/system/chromeos/palette/palette_utils.h"

-#include "ash/common/system/keyboard_brightness_control_delegate.h"

-#include "ash/common/system/status_area_widget.h"

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

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

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

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

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

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

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

@@ -42,6 +32,16 @@

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

#include "ash/root_window_controller.h"

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

+#include "ash/system/brightness_control_delegate.h"

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

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

+#include "ash/system/palette/palette_tray.h"

+#include "ash/system/palette/palette_utils.h"

+#include "ash/system/status_area_widget.h"

+#include "ash/system/system_notifier.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 "base/metrics/histogram_macros.h"

#include "base/metrics/user_metrics.h"

#include "chromeos/dbus/dbus_thread_manager.h"

« no previous file with comments | « ash/ash_touch_exploration_manager_chromeos.cc ('k') | ash/common/accelerators/debug_commands.cc » ('j') | no next file with comments »