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

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

Issue 210903003: Implemented system tray UI for new account management. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments addressed. Created 6 years, 9 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 | Annotate | Revision Log
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 "apps/app_window_registry.h" 8 #include "apps/app_window_registry.h"
9 #include "ash/ime/input_method_menu_manager.h" 9 #include "ash/ime/input_method_menu_manager.h"
10 #include "ash/session_state_observer.h" 10 #include "ash/session_state_observer.h"
11 #include "ash/system/tray/system_tray.h" 11 #include "ash/system/tray/system_tray.h"
12 #include "ash/system/tray/system_tray_delegate.h" 12 #include "ash/system/tray/system_tray_delegate.h"
13 #include "ash/system/tray/system_tray_notifier.h" 13 #include "ash/system/tray/system_tray_notifier.h"
14 #include "base/callback_list.h" 14 #include "base/callback_list.h"
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/containers/scoped_ptr_hash_map.h"
16 #include "base/memory/ref_counted.h" 17 #include "base/memory/ref_counted.h"
17 #include "base/memory/weak_ptr.h" 18 #include "base/memory/weak_ptr.h"
18 #include "base/prefs/pref_change_registrar.h" 19 #include "base/prefs/pref_change_registrar.h"
19 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 20 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
20 #include "chrome/browser/chromeos/drive/drive_integration_service.h" 21 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
21 #include "chrome/browser/chromeos/drive/job_list.h" 22 #include "chrome/browser/chromeos/drive/job_list.h"
22 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" 24 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
24 #include "chrome/browser/ui/browser_list_observer.h" 25 #include "chrome/browser/ui/browser_list_observer.h"
25 #include "chromeos/audio/cras_audio_handler.h" 26 #include "chromeos/audio/cras_audio_handler.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 scoped_ptr<ash::VolumeControlDelegate> delegate) OVERRIDE; 127 scoped_ptr<ash::VolumeControlDelegate> delegate) OVERRIDE;
127 virtual bool GetSessionStartTime(base::TimeTicks* session_start_time) 128 virtual bool GetSessionStartTime(base::TimeTicks* session_start_time)
128 OVERRIDE; 129 OVERRIDE;
129 virtual bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) 130 virtual bool GetSessionLengthLimit(base::TimeDelta* session_length_limit)
130 OVERRIDE; 131 OVERRIDE;
131 virtual int GetSystemTrayMenuWidth() OVERRIDE; 132 virtual int GetSystemTrayMenuWidth() OVERRIDE;
132 virtual void ActiveUserWasChanged() OVERRIDE; 133 virtual void ActiveUserWasChanged() OVERRIDE;
133 virtual bool IsNetworkBehindCaptivePortal( 134 virtual bool IsNetworkBehindCaptivePortal(
134 const std::string& service_path) const OVERRIDE; 135 const std::string& service_path) const OVERRIDE;
135 virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE; 136 virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE;
137 virtual ash::tray::UserAccountsDelegate* GetUserAccountsDelegate(
138 const std::string& user_id) OVERRIDE;
136 139
137 // browser tests need to call ShouldUse24HourClock(). 140 // browser tests need to call ShouldUse24HourClock().
138 bool GetShouldUse24HourClockForTesting() const; 141 bool GetShouldUse24HourClockForTesting() const;
139 142
140 private: 143 private:
141 // Should be the same as CrosSettings::ObserverSubscription. 144 // Should be the same as CrosSettings::ObserverSubscription.
142 typedef base::CallbackList<void(void)>::Subscription 145 typedef base::CallbackList<void(void)>::Subscription
143 CrosSettingsObserverSubscription; 146 CrosSettingsObserverSubscription;
144 147
145 ash::SystemTray* GetPrimarySystemTray(); 148 ash::SystemTray* GetPrimarySystemTray();
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 bool have_session_length_limit_; 273 bool have_session_length_limit_;
271 base::TimeDelta session_length_limit_; 274 base::TimeDelta session_length_limit_;
272 std::string enterprise_domain_; 275 std::string enterprise_domain_;
273 bool should_run_bluetooth_discovery_; 276 bool should_run_bluetooth_discovery_;
274 277
275 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; 278 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
276 scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_; 279 scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_;
277 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_; 280 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
278 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_; 281 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_;
279 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_; 282 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
283 base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate>
284 accounts_delegates_;
280 285
281 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 286 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
282 }; 287 };
283 288
284 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 289 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
285 290
286 } // namespace chromeos 291 } // namespace chromeos
287 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 292 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698