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

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

Issue 166273014: Remove dependency on NotificationService for cros a11y settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge ToT. Created 6 years, 10 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 "ash/ime/input_method_menu_manager.h" 8 #include "ash/ime/input_method_menu_manager.h"
9 #include "ash/session_state_observer.h" 9 #include "ash/session_state_observer.h"
10 #include "ash/system/tray/system_tray.h" 10 #include "ash/system/tray/system_tray.h"
11 #include "ash/system/tray/system_tray_delegate.h" 11 #include "ash/system/tray/system_tray_delegate.h"
12 #include "ash/system/tray/system_tray_notifier.h" 12 #include "ash/system/tray/system_tray_notifier.h"
13 #include "base/callback_list.h" 13 #include "base/callback_list.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "base/prefs/pref_change_registrar.h" 17 #include "base/prefs/pref_change_registrar.h"
18 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
18 #include "chrome/browser/chromeos/drive/drive_integration_service.h" 19 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
19 #include "chrome/browser/chromeos/drive/job_list.h" 20 #include "chrome/browser/chromeos/drive/job_list.h"
20 #include "chrome/browser/chromeos/events/system_key_event_listener.h" 21 #include "chrome/browser/chromeos/events/system_key_event_listener.h"
21 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" 23 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
23 #include "chromeos/audio/cras_audio_handler.h" 24 #include "chromeos/audio/cras_audio_handler.h"
24 #include "chromeos/dbus/session_manager_client.h" 25 #include "chromeos/dbus/session_manager_client.h"
25 #include "chromeos/ime/input_method_manager.h" 26 #include "chromeos/ime/input_method_manager.h"
26 #include "chromeos/login/login_state.h" 27 #include "chromeos/login/login_state.h"
27 #include "components/policy/core/common/cloud/cloud_policy_store.h" 28 #include "components/policy/core/common/cloud/cloud_policy_store.h"
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 virtual void OnCapsLockChange(bool enabled) OVERRIDE; 226 virtual void OnCapsLockChange(bool enabled) OVERRIDE;
226 227
227 void UpdateEnterpriseDomain(); 228 void UpdateEnterpriseDomain();
228 229
229 // Overridden from CloudPolicyStore::Observer 230 // Overridden from CloudPolicyStore::Observer
230 virtual void OnStoreLoaded(policy::CloudPolicyStore* store) OVERRIDE; 231 virtual void OnStoreLoaded(policy::CloudPolicyStore* store) OVERRIDE;
231 virtual void OnStoreError(policy::CloudPolicyStore* store) OVERRIDE; 232 virtual void OnStoreError(policy::CloudPolicyStore* store) OVERRIDE;
232 // Overridden from ash::SessionStateObserver 233 // Overridden from ash::SessionStateObserver
233 virtual void UserAddedToSession(const std::string& user_id) OVERRIDE; 234 virtual void UserAddedToSession(const std::string& user_id) OVERRIDE;
234 235
236 void OnAccessibilityStatusChanged(
237 const AccessibilityStatusEventDetails& details);
238
235 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 239 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
236 scoped_ptr<content::NotificationRegistrar> registrar_; 240 scoped_ptr<content::NotificationRegistrar> registrar_;
237 scoped_ptr<PrefChangeRegistrar> local_state_registrar_; 241 scoped_ptr<PrefChangeRegistrar> local_state_registrar_;
238 scoped_ptr<PrefChangeRegistrar> user_pref_registrar_; 242 scoped_ptr<PrefChangeRegistrar> user_pref_registrar_;
239 Profile* user_profile_; 243 Profile* user_profile_;
240 base::HourClockType clock_type_; 244 base::HourClockType clock_type_;
241 int search_key_mapped_to_; 245 int search_key_mapped_to_;
242 bool screen_locked_; 246 bool screen_locked_;
243 bool have_session_start_time_; 247 bool have_session_start_time_;
244 base::TimeTicks session_start_time_; 248 base::TimeTicks session_start_time_;
245 bool have_session_length_limit_; 249 bool have_session_length_limit_;
246 base::TimeDelta session_length_limit_; 250 base::TimeDelta session_length_limit_;
247 std::string enterprise_domain_; 251 std::string enterprise_domain_;
248 252
249 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; 253 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
250 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_; 254 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
251 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_; 255 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_;
256 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
252 257
253 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 258 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
254 }; 259 };
255 260
256 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 261 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
257 262
258 } // namespace chromeos 263 } // namespace chromeos
259 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 264 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698