chrome/browser/ui/ash/system_tray_delegate_chromeos.h - Issue 1428213004: This CL replaces std::string user_id in ash/* with AccountId.

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

Issue 1428213004: This CL replaces std::string user_id in ash/* with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix tests. Created 5 years, 1 month 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

« chrome/browser/ui/ash/session_state_delegate_chromeos.cc ('K') | « chrome/browser/ui/ash/session_state_delegate_views.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h

index 2a04e44683dca1c44d2c744b17a887ae287d69cd..e0e5fc1520be81f5f50f78ef5420e4684b22838d 100644

--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h

+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h

@@ -31,6 +31,7 @@

#include "chromeos/audio/cras_audio_handler.h"

#include "chromeos/dbus/session_manager_client.h"

#include "components/policy/core/common/cloud/cloud_policy_store.h"

+#include "components/signin/core/account_id/account_id.h"

#include "components/user_manager/user_manager.h"

#include "content/public/browser/notification_observer.h"

#include "content/public/browser/notification_registrar.h"

@@ -136,7 +137,7 @@ class SystemTrayDelegateChromeOS

void ActiveUserWasChanged() override;

bool IsSearchKeyMappedToCapsLock() override;

ash::tray::UserAccountsDelegate* GetUserAccountsDelegate(

- const std::string& user_id) override;

+ const AccountId& account_id) override;

void AddCustodianInfoTrayObserver(

ash::CustodianInfoTrayObserver* observer) override;

void RemoveCustodianInfoTrayObserver(

@@ -249,8 +250,8 @@ class SystemTrayDelegateChromeOS

void OnStoreError(policy::CloudPolicyStore* store) override;

// Overridden from ash::SessionStateObserver

- void UserAddedToSession(const std::string& user_id) override;

- void ActiveUserChanged(const std::string& user_id) override;

+ void UserAddedToSession(const AccountId& account_id) override;

+ void ActiveUserChanged(const AccountId& account_id) override;

// Overridden from chrome::BrowserListObserver:

void OnBrowserRemoved(Browser* browser) override;

@@ -292,8 +293,7 @@ class SystemTrayDelegateChromeOS

scoped_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_;

scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;

scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;

- base::ScopedPtrHashMap<std::string,

- scoped_ptr<ash::tray::UserAccountsDelegate>>

+ base::ScopedPtrHashMap<AccountId, scoped_ptr<ash::tray::UserAccountsDelegate>>

stevenjb 2015/11/06 17:45:29 Is AccointId going to hash well? I think that Scop

Alexander Alekseev 2015/11/06 23:38:59 Done.

accounts_delegates_;

scoped_ptr<ShutdownPolicyHandler> shutdown_policy_handler_;

scoped_ptr<ash::VPNDelegate> vpn_delegate_;