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 /chrome/browser/ui/ash/system_tray_delegate_chromeos.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 'chrome/browser/ui/ash/system_tray_delegate_chromeos.cc')
-rw-r--r-- | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc index 02eaccd..000bd67 100644 --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc @@ -14,8 +14,8 @@ #include "ash/ime/input_method_menu_item.h" #include "ash/ime/input_method_menu_manager.h" #include "ash/metrics/user_metrics_recorder.h" -#include "ash/session/session_state_delegate.h" -#include "ash/session/session_state_observer.h" +#include "ash/session_state_delegate.h" +#include "ash/session_state_observer.h" #include "ash/shell.h" #include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" |