diff options
author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 10:15:03 +0000 |
---|---|---|
committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 10:15:03 +0000 |
commit | 25cae45b57e37ec91318ec019b49d75c5f646097 (patch) | |
tree | af304cb4a811213d8df47ca5c43b43d93fdd922f /ash/accelerators | |
parent | 52cb0d6dab92288b0cf79afd7a1bcc86d12c9976 (diff) | |
download | chromium_src-25cae45b57e37ec91318ec019b49d75c5f646097.zip chromium_src-25cae45b57e37ec91318ec019b49d75c5f646097.tar.gz chromium_src-25cae45b57e37ec91318ec019b49d75c5f646097.tar.bz2 |
Move Power and Clock observers to Ash
BUG=154856
Review URL: https://codereview.chromium.org/24497002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
-rw-r--r-- | ash/accelerators/accelerator_controller.cc | 2 | ||||
-rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 6633a7f..e0e6338 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -32,7 +32,7 @@ #include "ash/shell.h" #include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" -#include "ash/system/brightness/brightness_control_delegate.h" +#include "ash/system/brightness_control_delegate.h" #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h" #include "ash/system/status_area_widget.h" #include "ash/system/tray/system_tray.h" diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index 478a9e7..341ab1f 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -10,7 +10,7 @@ #include "ash/screenshot_delegate.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" -#include "ash/system/brightness/brightness_control_delegate.h" +#include "ash/system/brightness_control_delegate.h" #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/test/ash_test_base.h" |