diff options
author | dzhioev@chromium.org <dzhioev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 13:17:17 +0000 |
---|---|---|
committer | dzhioev@chromium.org <dzhioev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 13:17:17 +0000 |
commit | d7ffac75143b8ca0ba900844360f1c6583d36b0d (patch) | |
tree | 1c8d4210bd6786d695fa6cdb4910dc3dcdb95a40 /ash/test | |
parent | 1ddf5f18253195a96ff84e4eb2ac9428b7939da6 (diff) | |
download | chromium_src-d7ffac75143b8ca0ba900844360f1c6583d36b0d.zip chromium_src-d7ffac75143b8ca0ba900844360f1c6583d36b0d.tar.gz chromium_src-d7ffac75143b8ca0ba900844360f1c6583d36b0d.tar.bz2 |
Implemented system tray UI for new account management.
* Added new mode in TrayUser for the case when new account management is
enabled (--new-profile-management flag). In fact TrayUser is now supporting
four different modes, depending of states of |multi-profiles| flag and
|new-profile-management| flag.
* Massive refactoring were made in tray_user.cc to isolate UserCardView
creation in separate class and make code more clear.
* UI for the cases when new account management is disabled remained without
changes.
Known issues:
* There are no tests for new UI. Hopefully old UI is covered by tests already.
* New UI is not accessible yet.
* Stub implementation of UserAccountsDelegate is used for backend.
BUG=344844
TEST=manually
Review URL: https://codereview.chromium.org/210903003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
-rw-r--r-- | ash/test/test_session_state_delegate.cc | 5 | ||||
-rw-r--r-- | ash/test/test_session_state_delegate.h | 2 | ||||
-rw-r--r-- | ash/test/test_shell_delegate.cc | 4 | ||||
-rw-r--r-- | ash/test/test_shell_delegate.h | 1 |
4 files changed, 12 insertions, 0 deletions
diff --git a/ash/test/test_session_state_delegate.cc b/ash/test/test_session_state_delegate.cc index 491408e..c4f1ea5 100644 --- a/ash/test/test_session_state_delegate.cc +++ b/ash/test/test_session_state_delegate.cc @@ -134,6 +134,11 @@ const base::string16 TestSessionStateDelegate::GetUserDisplayName( return base::UTF8ToUTF16("Über tray Über tray Über tray Über tray"); } +const base::string16 TestSessionStateDelegate::GetUserGivenName( + MultiProfileIndex index) const { + return base::UTF8ToUTF16("Über Über Über Über"); +} + const std::string TestSessionStateDelegate::GetUserEmail( MultiProfileIndex index) const { switch (index) { diff --git a/ash/test/test_session_state_delegate.h b/ash/test/test_session_state_delegate.h index 2cc95e5..e56771d 100644 --- a/ash/test/test_session_state_delegate.h +++ b/ash/test/test_session_state_delegate.h @@ -37,6 +37,8 @@ class TestSessionStateDelegate : public SessionStateDelegate { virtual bool IsUserSessionBlocked() const OVERRIDE; virtual const base::string16 GetUserDisplayName( ash::MultiProfileIndex index) const OVERRIDE; + virtual const base::string16 GetUserGivenName( + ash::MultiProfileIndex index) const OVERRIDE; virtual const std::string GetUserEmail( ash::MultiProfileIndex index) const OVERRIDE; virtual const std::string GetUserID( diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index f9be936..d2eeb10 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -77,6 +77,10 @@ bool TestShellDelegate::IsRunningInForcedAppMode() const { return false; } +bool TestShellDelegate::IsMultiAccountEnabled() const { + return false; +} + void TestShellDelegate::PreInit() { } diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h index 4c69717..b5d17df 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h @@ -34,6 +34,7 @@ class TestShellDelegate : public ShellDelegate { virtual bool IsIncognitoAllowed() const OVERRIDE; virtual bool IsMultiProfilesEnabled() const OVERRIDE; virtual bool IsRunningInForcedAppMode() const OVERRIDE; + virtual bool IsMultiAccountEnabled() const OVERRIDE; virtual void PreInit() OVERRIDE; virtual void PreShutdown() OVERRIDE; virtual void Exit() OVERRIDE; |