diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-14 23:48:30 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-14 23:48:30 +0000 |
| commit | d66eac44cda6b48f70bf6ef06adc72c8638b39bf (patch) | |
| tree | f0f59465b920eb98baf01219d4d36df47822644a /ash/frame/frame_util.cc | |
| parent | dae74c14f2a4543d900e0e5e37632ed111a08ffe (diff) | |
| download | chromium_src-d66eac44cda6b48f70bf6ef06adc72c8638b39bf.zip chromium_src-d66eac44cda6b48f70bf6ef06adc72c8638b39bf.tar.gz chromium_src-d66eac44cda6b48f70bf6ef06adc72c8638b39bf.tar.bz2 | |
Move UserInfo to user_manager.
Since user_manager::UserInfo is used on non-chromeos ash implementation, defined part of user_manager component that is included on cross-platform ash.
BUG=387614
Review URL: https://codereview.chromium.org/379803004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/frame/frame_util.cc')
| -rw-r--r-- | ash/frame/frame_util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/frame/frame_util.cc b/ash/frame/frame_util.cc index fd26783..c4b1be9 100644 --- a/ash/frame/frame_util.cc +++ b/ash/frame/frame_util.cc @@ -5,8 +5,8 @@ #include "ash/frame/frame_util.h" #include "ash/session/session_state_delegate.h" -#include "ash/session/user_info.h" #include "ash/shell.h" +#include "components/user_manager/user_info.h" #include "grit/ash_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" |