diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 17:15:12 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 17:15:12 +0000 |
| commit | 6e50d42bdd5307d76a90fb398774d140f796eace (patch) | |
| tree | d27fdbdaf6106a62fa45a48e0543eff70dde6ae4 /ash/shelf/shelf_layout_manager.cc | |
| parent | 3d48423a74668a7cfd71ba895a2c510ec85447b5 (diff) | |
| download | chromium_src-6e50d42bdd5307d76a90fb398774d140f796eace.zip chromium_src-6e50d42bdd5307d76a90fb398774d140f796eace.tar.gz chromium_src-6e50d42bdd5307d76a90fb398774d140f796eace.tar.bz2 | |
Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."
> 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
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/260783002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf/shelf_layout_manager.cc')
| -rw-r--r-- | ash/shelf/shelf_layout_manager.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc index 9df4bdc..7a1998d 100644 --- a/ash/shelf/shelf_layout_manager.cc +++ b/ash/shelf/shelf_layout_manager.cc @@ -14,7 +14,7 @@ #include "ash/ash_switches.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" -#include "ash/session/session_state_delegate.h" +#include "ash/session_state_delegate.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_bezel_event_filter.h" #include "ash/shelf/shelf_constants.h" |