A11y: Introduce High Contrast Mode and Screen Magnifier to ubar tray.

chrome/browser/chromeos/system/ash_system_tray_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/audio_observer.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
@@ skipping 179 matching lines @@
       registrar_.Add(this,
                      chrome::NOTIFICATION_SESSION_STARTED,
                      content::NotificationService::AllSources());
     }
     registrar_.Add(this,
                    chrome::NOTIFICATION_PROFILE_CREATED,
                    content::NotificationService::AllSources());
     registrar_.Add(this,
                    chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
                    content::NotificationService::AllSources());
-
   }
 
   virtual void Initialize() OVERRIDE {
     AudioHandler::GetInstance()->AddVolumeObserver(this);
     DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
     DBusThreadManager::Get()->GetPowerManagerClient()->RequestStatusUpdate(
         PowerManagerClient::UPDATE_INITIAL);
     DBusThreadManager::Get()->GetRootPowerManagerClient()->AddObserver(this);
     DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(this);
 
     NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
     crosnet->AddNetworkManagerObserver(this);
     OnNetworkManagerChanged(crosnet);
 
     input_method::InputMethodManager::GetInstance()->AddObserver(this);
 
     system::TimezoneSettings::GetInstance()->AddObserver(this);
 
     if (SystemKeyEventListener::GetInstance())
       SystemKeyEventListener::GetInstance()->AddCapsLockObserver(this);
 
-    accessibility_enabled_.Init(
+    spoken_feedback_enabled_.Init(
         prefs::kSpokenFeedbackEnabled,
         g_browser_process->local_state(),
-        base::Bind(&SystemTrayDelegate::OnSpokenFeedbackEnabledChanged,
+        base::Bind(&SystemTrayDelegate::OnAccessibilityModeChanged,
+                   base::Unretained(this)));
+
+    high_contrast_enabled_.Init(
+        prefs::kHighContrastEnabled,
+        g_browser_process->local_state(),
+        base::Bind(&SystemTrayDelegate::OnAccessibilityModeChanged,
                    base::Unretained(this)));
 
     network_icon_->SetResourceColorTheme(NetworkMenuIcon::COLOR_LIGHT);
     network_icon_dark_->SetResourceColorTheme(NetworkMenuIcon::COLOR_DARK);
 
     bluetooth_adapter_ = device::BluetoothAdapterFactory::DefaultAdapter();
     bluetooth_adapter_->AddObserver(this);
   }
 
   virtual ~SystemTrayDelegate() {
@@ skipping 112 matching lines @@
     content::RecordAction(
         content::UserMetricsAction("OpenLanguageOptionsDialog"));
     chrome::ShowSettingsSubPage(GetAppropriateBrowser(),
                                 chrome::kLanguageOptionsSubPage);
   }
 
   virtual void ShowHelp() OVERRIDE {
     chrome::ShowHelp(GetAppropriateBrowser(), chrome::HELP_SOURCE_MENU);
   }
 
+  virtual void ShowAccessibilityHelp() OVERRIDE {
+    accessibility::ShowAccessibilityHelp(GetAppropriateBrowser());
+  }
+
   virtual void ShutDown() OVERRIDE {
     ash::Shell::GetInstance()->session_state_controller()->RequestShutdown();
   }
 
   virtual void SignOut() OVERRIDE {
     browser::AttemptUserExit();
   }
 
   virtual void RequestLockScreen() OVERRIDE {
     DBusThreadManager::Get()->GetSessionManagerClient()->RequestLockScreen();
@@ skipping 394 matching lines @@
         base::Bind(&SystemTrayDelegate::UpdateClockType,
                    base::Unretained(this)));
     pref_registrar_->Add(
         prefs::kLanguageRemapSearchKeyTo,
         base::Bind(&SystemTrayDelegate::OnLanguageRemapSearchKeyToChanged,
                    base::Unretained(this)));
     pref_registrar_->Add(
         prefs::kShowLogoutButtonInTray,
         base::Bind(&SystemTrayDelegate::UpdateShowLogoutButtonInTray,
                    base::Unretained(this)));
+    pref_registrar_->Add(
+        prefs::kMagnifierType,
+        base::Bind(&SystemTrayDelegate::OnAccessibilityModeChanged,
+                   base::Unretained(this)));
+
     UpdateClockType();
     UpdateShowLogoutButtonInTray();
     search_key_mapped_to_ =
         profile->GetPrefs()->GetInteger(prefs::kLanguageRemapSearchKeyTo);
   }
 
   void ObserveGDataUpdates() {
     DriveSystemService* system_service = FindDriveSystemService();
     if (!system_service)
       return;
@@ skipping 306 matching lines @@
       default:
         NOTREACHED();
     }
   }
 
   void OnLanguageRemapSearchKeyToChanged() {
     search_key_mapped_to_ = pref_registrar_->prefs()->GetInteger(
         prefs::kLanguageRemapSearchKeyTo);
   }
 
-  void OnSpokenFeedbackEnabledChanged() {
-    GetSystemTrayNotifier()->NotifyAccessibilityModeChanged(
-        accessibility_enabled_.prefs()->GetBoolean(
-            prefs::kSpokenFeedbackEnabled));
+  void OnAccessibilityModeChanged() {
+    GetSystemTrayNotifier()->NotifyAccessibilityModeChanged();
   }
 
   // Overridden from InputMethodManager::Observer.
   virtual void InputMethodChanged(
       input_method::InputMethodManager* manager, bool show_message) OVERRIDE {
     GetSystemTrayNotifier()->NotifyRefreshIME(show_message);
   }
 
   virtual void InputMethodPropertyChanged(
       input_method::InputMethodManager* manager) OVERRIDE {
@@ skipping 144 matching lines @@
   base::HourClockType clock_type_;
   int search_key_mapped_to_;
   bool screen_locked_;
   ConnectionState connected_network_state_;
   std::string connected_network_path_;
 
   std::string last_connection_string_;
 
   scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
 
-  BooleanPrefMember accessibility_enabled_;
+  BooleanPrefMember spoken_feedback_enabled_;
+  BooleanPrefMember high_contrast_enabled_;
 
   scoped_ptr<DataPromoNotification> data_promo_notification_;
 
   scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new chromeos::SystemTrayDelegate();
 }
 
 }  // namespace chromeos