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

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: 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 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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 scoped_ptr<ash::VolumeControlDelegate> delegate) OVERRIDE; 128 scoped_ptr<ash::VolumeControlDelegate> delegate) OVERRIDE;
128 virtual bool GetSessionStartTime(base::TimeTicks* session_start_time) 129 virtual bool GetSessionStartTime(base::TimeTicks* session_start_time)
129 OVERRIDE; 130 OVERRIDE;
130 virtual bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) 131 virtual bool GetSessionLengthLimit(base::TimeDelta* session_length_limit)
131 OVERRIDE; 132 OVERRIDE;
132 virtual int GetSystemTrayMenuWidth() OVERRIDE; 133 virtual int GetSystemTrayMenuWidth() OVERRIDE;
133 virtual void ActiveUserWasChanged() OVERRIDE; 134 virtual void ActiveUserWasChanged() OVERRIDE;
134 virtual bool IsNetworkBehindCaptivePortal( 135 virtual bool IsNetworkBehindCaptivePortal(
135 const std::string& service_path) const OVERRIDE; 136 const std::string& service_path) const OVERRIDE;
136 virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE; 137 virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE;
138 virtual ash::tray::UserAccountsDelegate* GetUserAccountsDelegate(
139 const std::string& user_id) OVERRIDE;
137 140
138 // browser tests need to call ShouldUse24HourClock(). 141 // browser tests need to call ShouldUse24HourClock().
139 bool GetShouldUse24HourClockForTesting() const; 142 bool GetShouldUse24HourClockForTesting() const;
140 143
141 private: 144 private:
142 // Should be the same as CrosSettings::ObserverSubscription. 145 // Should be the same as CrosSettings::ObserverSubscription.
143 typedef base::CallbackList<void(void)>::Subscription 146 typedef base::CallbackList<void(void)>::Subscription
144 CrosSettingsObserverSubscription; 147 CrosSettingsObserverSubscription;
145 148
146 ash::SystemTray* GetPrimarySystemTray(); 149 ash::SystemTray* GetPrimarySystemTray();
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 bool have_session_length_limit_; 274 bool have_session_length_limit_;
272 base::TimeDelta session_length_limit_; 275 base::TimeDelta session_length_limit_;
273 std::string enterprise_domain_; 276 std::string enterprise_domain_;
274 bool should_run_bluetooth_discovery_; 277 bool should_run_bluetooth_discovery_;
275 278
276 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; 279 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
277 scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_; 280 scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_;
278 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_; 281 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
279 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_; 282 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_;
280 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_; 283 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
284 base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate>
285 accounts_delegates_;
281 286
282 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 287 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
283 }; 288 };
284 289
285 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 290 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
286 291
287 } // namespace chromeos 292 } // namespace chromeos
288 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 293 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/stub_user_accounts_delegate.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698