Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 210903003: Implemented system tray UI for new account management. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge conflicts resolved. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index a533a537adc139c1d374aa12d14b36de619d3e52..7989dc34c5eafb93a65b533d75c6ab5fcf0b0f45 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -77,6 +77,7 @@
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
+#include "chrome/browser/ui/ash/stub_user_accounts_delegate.h"
#include "chrome/browser/ui/ash/volume_controller_chromeos.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -914,6 +915,26 @@ bool SystemTrayDelegateChromeOS::IsSearchKeyMappedToCapsLock() {
return search_key_mapped_to_ == input_method::kCapsLockKey;
}
+ash::tray::UserAccountsDelegate*
+SystemTrayDelegateChromeOS::GetUserAccountsDelegate(
+ const std::string& user_id) {
+ if (!accounts_delegates_.contains(user_id)) {
+ // TODO(dzhioev): replace stub with real implementation.
+ accounts_delegates_.set(user_id,
+ scoped_ptr<ash::tray::UserAccountsDelegate>(
+ new StubUserAccountsDelegate(user_id)));
+ static_cast<StubUserAccountsDelegate*>(accounts_delegates_.get(user_id))
+ ->AddAccount("secondary_account1@gmail.com");
+ static_cast<StubUserAccountsDelegate*>(accounts_delegates_.get(user_id))
+ ->AddAccount("very_long_account_name_for_user@gmail.com");
+ static_cast<StubUserAccountsDelegate*>(accounts_delegates_.get(user_id))
+ ->AddAccount("secondary_account2@gmail.com");
+ static_cast<StubUserAccountsDelegate*>(accounts_delegates_.get(user_id))
+ ->AddAccount("very_very_very_long_account_name_for_user@gmail.com");
+ }
+ return accounts_delegates_.get(user_id);
+}
+
ash::SystemTray* SystemTrayDelegateChromeOS::GetPrimarySystemTray() {
return ash::Shell::GetInstance()->GetPrimarySystemTray();
}
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | chrome/browser/ui/ash/system_tray_delegate_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698