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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.h
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
index ec6fb22bb507e92601e92834a4492ab6985ea082..c37575aac986e10196baf43b853cf5f2b2d6246a 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -15,6 +15,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/prefs/pref_change_registrar.h"
+#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
#include "chrome/browser/chromeos/drive/drive_integration_service.h"
#include "chrome/browser/chromeos/drive/job_list.h"
#include "chrome/browser/chromeos/events/system_key_event_listener.h"
@@ -232,6 +233,9 @@ class SystemTrayDelegateChromeOS
// Overridden from ash::SessionStateObserver
virtual void UserAddedToSession(const std::string& user_id) OVERRIDE;
+ void OnAccessibilityStatusChanged(
+ const AccessibilityStatusEventDetails& details);
+
base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
scoped_ptr<content::NotificationRegistrar> registrar_;
scoped_ptr<PrefChangeRegistrar> local_state_registrar_;
@@ -249,6 +253,7 @@ class SystemTrayDelegateChromeOS
scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_;
+ scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
};

Powered by Google App Engine
This is Rietveld 408576698