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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 27 matching lines...) Expand all
38 #include "extensions/browser/app_window/app_window_registry.h" 38 #include "extensions/browser/app_window/app_window_registry.h"
39 #include "ui/base/ime/chromeos/input_method_manager.h" 39 #include "ui/base/ime/chromeos/input_method_manager.h"
40 #include "ui/chromeos/ime/input_method_menu_manager.h" 40 #include "ui/chromeos/ime/input_method_menu_manager.h"
41 41
42 namespace ash { 42 namespace ash {
43 class VPNDelegate; 43 class VPNDelegate;
44 } 44 }
45 45
46 namespace user_manager { 46 namespace user_manager {
47 class User; 47 class User;
48 class UserID;
48 } 49 }
49 50
50 namespace chromeos { 51 namespace chromeos {
51 52
52 class SystemTrayDelegateChromeOS 53 class SystemTrayDelegateChromeOS
53 : public ui::ime::InputMethodMenuManager::Observer, 54 : public ui::ime::InputMethodMenuManager::Observer,
54 public ash::SystemTrayDelegate, 55 public ash::SystemTrayDelegate,
55 public SessionManagerClient::Observer, 56 public SessionManagerClient::Observer,
56 public content::NotificationObserver, 57 public content::NotificationObserver,
57 public input_method::InputMethodManager::Observer, 58 public input_method::InputMethodManager::Observer,
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override; 130 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override;
130 ash::VolumeControlDelegate* GetVolumeControlDelegate() const override; 131 ash::VolumeControlDelegate* GetVolumeControlDelegate() const override;
131 void SetVolumeControlDelegate( 132 void SetVolumeControlDelegate(
132 scoped_ptr<ash::VolumeControlDelegate> delegate) override; 133 scoped_ptr<ash::VolumeControlDelegate> delegate) override;
133 bool GetSessionStartTime(base::TimeTicks* session_start_time) override; 134 bool GetSessionStartTime(base::TimeTicks* session_start_time) override;
134 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override; 135 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override;
135 int GetSystemTrayMenuWidth() override; 136 int GetSystemTrayMenuWidth() override;
136 void ActiveUserWasChanged() override; 137 void ActiveUserWasChanged() override;
137 bool IsSearchKeyMappedToCapsLock() override; 138 bool IsSearchKeyMappedToCapsLock() override;
138 ash::tray::UserAccountsDelegate* GetUserAccountsDelegate( 139 ash::tray::UserAccountsDelegate* GetUserAccountsDelegate(
139 const std::string& user_id) override; 140 const user_manager::UserID& user_id) override;
140 void AddCustodianInfoTrayObserver( 141 void AddCustodianInfoTrayObserver(
141 ash::CustodianInfoTrayObserver* observer) override; 142 ash::CustodianInfoTrayObserver* observer) override;
142 void RemoveCustodianInfoTrayObserver( 143 void RemoveCustodianInfoTrayObserver(
143 ash::CustodianInfoTrayObserver* observer) override; 144 ash::CustodianInfoTrayObserver* observer) override;
144 void AddShutdownPolicyObserver( 145 void AddShutdownPolicyObserver(
145 ash::ShutdownPolicyObserver* observer) override; 146 ash::ShutdownPolicyObserver* observer) override;
146 void RemoveShutdownPolicyObserver( 147 void RemoveShutdownPolicyObserver(
147 ash::ShutdownPolicyObserver* observer) override; 148 ash::ShutdownPolicyObserver* observer) override;
148 void ShouldRebootOnShutdown( 149 void ShouldRebootOnShutdown(
149 const ash::RebootOnShutdownCallback& callback) override; 150 const ash::RebootOnShutdownCallback& callback) override;
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 void OnStartBluetoothDiscoverySession( 248 void OnStartBluetoothDiscoverySession(
248 scoped_ptr<device::BluetoothDiscoverySession> discovery_session); 249 scoped_ptr<device::BluetoothDiscoverySession> discovery_session);
249 250
250 void UpdateEnterpriseDomain(); 251 void UpdateEnterpriseDomain();
251 252
252 // Overridden from CloudPolicyStore::Observer 253 // Overridden from CloudPolicyStore::Observer
253 void OnStoreLoaded(policy::CloudPolicyStore* store) override; 254 void OnStoreLoaded(policy::CloudPolicyStore* store) override;
254 void OnStoreError(policy::CloudPolicyStore* store) override; 255 void OnStoreError(policy::CloudPolicyStore* store) override;
255 256
256 // Overridden from ash::SessionStateObserver 257 // Overridden from ash::SessionStateObserver
257 void UserAddedToSession(const std::string& user_id) override; 258 void UserAddedToSession(const user_manager::UserID& user_id) override;
258 void ActiveUserChanged(const std::string& user_id) override; 259 void ActiveUserChanged(const user_manager::UserID& user_id) override;
259 260
260 // Overridden from chrome::BrowserListObserver: 261 // Overridden from chrome::BrowserListObserver:
261 void OnBrowserRemoved(Browser* browser) override; 262 void OnBrowserRemoved(Browser* browser) override;
262 263
263 // Overridden from extensions::AppWindowRegistry::Observer: 264 // Overridden from extensions::AppWindowRegistry::Observer:
264 void OnAppWindowRemoved(extensions::AppWindow* app_window) override; 265 void OnAppWindowRemoved(extensions::AppWindow* app_window) override;
265 266
266 // Overridden from SupervisedUserServiceObserver: 267 // Overridden from SupervisedUserServiceObserver:
267 void OnCustodianInfoChanged() override; 268 void OnCustodianInfoChanged() override;
268 269
(...skipping 22 matching lines...) Expand all
291 bool should_run_bluetooth_discovery_; 292 bool should_run_bluetooth_discovery_;
292 bool session_started_; 293 bool session_started_;
293 294
294 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; 295 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
295 scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_; 296 scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_;
296 scoped_ptr<ash::CastConfigDelegate> cast_config_delegate_; 297 scoped_ptr<ash::CastConfigDelegate> cast_config_delegate_;
297 scoped_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; 298 scoped_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_;
298 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_; 299 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
299 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_; 300 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_;
300 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_; 301 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
301 base::ScopedPtrHashMap<std::string, 302 base::ScopedPtrHashMap<user_manager::UserID,
302 scoped_ptr<ash::tray::UserAccountsDelegate>> 303 scoped_ptr<ash::tray::UserAccountsDelegate>>
303 accounts_delegates_; 304 accounts_delegates_;
304 scoped_ptr<ShutdownPolicyHandler> shutdown_policy_handler_; 305 scoped_ptr<ShutdownPolicyHandler> shutdown_policy_handler_;
305 scoped_ptr<ash::VPNDelegate> vpn_delegate_; 306 scoped_ptr<ash::VPNDelegate> vpn_delegate_;
306 307
307 ObserverList<ash::CustodianInfoTrayObserver> 308 ObserverList<ash::CustodianInfoTrayObserver>
308 custodian_info_changed_observers_; 309 custodian_info_changed_observers_;
309 310
310 ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_; 311 ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_;
311 312
312 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 313 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
313 314
314 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 315 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
315 }; 316 };
316 317
317 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 318 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
318 319
319 } // namespace chromeos 320 } // namespace chromeos
320 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 321 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698