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

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: Fix magnification manager. 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/session_state_observer.h" 8 #include "ash/session_state_observer.h"
9 #include "ash/system/tray/system_tray.h" 9 #include "ash/system/tray/system_tray.h"
10 #include "ash/system/tray/system_tray_delegate.h" 10 #include "ash/system/tray/system_tray_delegate.h"
11 #include "ash/system/tray/system_tray_notifier.h" 11 #include "ash/system/tray/system_tray_notifier.h"
12 #include "base/callback_list.h" 12 #include "base/callback_list.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "base/prefs/pref_change_registrar.h" 16 #include "base/prefs/pref_change_registrar.h"
17 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
17 #include "chrome/browser/chromeos/drive/drive_integration_service.h" 18 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
18 #include "chrome/browser/chromeos/drive/job_list.h" 19 #include "chrome/browser/chromeos/drive/job_list.h"
19 #include "chrome/browser/chromeos/events/system_key_event_listener.h" 20 #include "chrome/browser/chromeos/events/system_key_event_listener.h"
20 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" 22 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
22 #include "chromeos/dbus/session_manager_client.h" 23 #include "chromeos/dbus/session_manager_client.h"
23 #include "chromeos/ime/input_method_manager.h" 24 #include "chromeos/ime/input_method_manager.h"
24 #include "chromeos/login/login_state.h" 25 #include "chromeos/login/login_state.h"
25 #include "components/policy/core/common/cloud/cloud_policy_store.h" 26 #include "components/policy/core/common/cloud/cloud_policy_store.h"
26 #include "content/public/browser/notification_observer.h" 27 #include "content/public/browser/notification_observer.h"
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 virtual void OnCapsLockChange(bool enabled) OVERRIDE; 212 virtual void OnCapsLockChange(bool enabled) OVERRIDE;
212 213
213 void UpdateEnterpriseDomain(); 214 void UpdateEnterpriseDomain();
214 215
215 // Overridden from CloudPolicyStore::Observer 216 // Overridden from CloudPolicyStore::Observer
216 virtual void OnStoreLoaded(policy::CloudPolicyStore* store) OVERRIDE; 217 virtual void OnStoreLoaded(policy::CloudPolicyStore* store) OVERRIDE;
217 virtual void OnStoreError(policy::CloudPolicyStore* store) OVERRIDE; 218 virtual void OnStoreError(policy::CloudPolicyStore* store) OVERRIDE;
218 // Overridden from ash::SessionStateObserver 219 // Overridden from ash::SessionStateObserver
219 virtual void UserAddedToSession(const std::string& user_id) OVERRIDE; 220 virtual void UserAddedToSession(const std::string& user_id) OVERRIDE;
220 221
222 void OnAccessibilityStatusChanged(
223 const AccessibilityStatusEventDetails& details);
224
221 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 225 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
222 scoped_ptr<content::NotificationRegistrar> registrar_; 226 scoped_ptr<content::NotificationRegistrar> registrar_;
223 scoped_ptr<PrefChangeRegistrar> local_state_registrar_; 227 scoped_ptr<PrefChangeRegistrar> local_state_registrar_;
224 scoped_ptr<PrefChangeRegistrar> user_pref_registrar_; 228 scoped_ptr<PrefChangeRegistrar> user_pref_registrar_;
225 Profile* user_profile_; 229 Profile* user_profile_;
226 base::HourClockType clock_type_; 230 base::HourClockType clock_type_;
227 int search_key_mapped_to_; 231 int search_key_mapped_to_;
228 bool screen_locked_; 232 bool screen_locked_;
229 bool have_session_start_time_; 233 bool have_session_start_time_;
230 base::TimeTicks session_start_time_; 234 base::TimeTicks session_start_time_;
231 bool have_session_length_limit_; 235 bool have_session_length_limit_;
232 base::TimeDelta session_length_limit_; 236 base::TimeDelta session_length_limit_;
233 std::string enterprise_domain_; 237 std::string enterprise_domain_;
234 238
235 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; 239 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
236 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_; 240 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
237 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_; 241 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_;
242 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
238 243
239 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 244 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
240 }; 245 };
241 246
242 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 247 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
243 248
244 } // namespace chromeos 249 } // namespace chromeos
245 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 250 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698