diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 10:33:51 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 10:33:51 +0000 |
| commit | 5a40d60411da361e5ac216efa90a80a29ebe8b57 (patch) | |
| tree | 4abb6c2b7957a65becce19018af7b66ee555da06 /ash/accelerators/accelerator_controller.cc | |
| parent | b8e9c841de80d18f9debade1fdbfafcccbfa3a5e (diff) | |
| download | chromium_src-5a40d60411da361e5ac216efa90a80a29ebe8b57.zip chromium_src-5a40d60411da361e5ac216efa90a80a29ebe8b57.tar.gz chromium_src-5a40d60411da361e5ac216efa90a80a29ebe8b57.tar.bz2 | |
CleanUp: Introduce UserInfo. Move session_state stuff to ash/session.
BUG=None
R=nkostylev@chromium.org
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/253063002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_controller.cc')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 7d70bc7..51f780c 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -28,7 +28,7 @@ #include "ash/root_window_controller.h" #include "ash/rotator/screen_rotation.h" #include "ash/screenshot_delegate.h" -#include "ash/session_state_delegate.h" +#include "ash/session/session_state_delegate.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_delegate.h" #include "ash/shelf/shelf_model.h" @@ -71,7 +71,7 @@ #include "ui/views/widget/widget.h" #if defined(OS_CHROMEOS) -#include "ash/session_state_delegate.h" +#include "ash/session/session_state_delegate.h" #include "ash/system/chromeos/keyboard_brightness_controller.h" #include "base/sys_info.h" #include "chromeos/ime/ime_keyboard.h" |