Add the partial screen magnifier to Chrome OS.

chrome/browser/ui/webui/options/browser_options_handler.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/ui/webui/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 95 matching lines @@
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DownloadManager;
 using content::OpenURLParams;
 using content::Referrer;
 using content::UserMetricsAction;
 
 namespace options {
 
+namespace {
+const char kScreenMagnifierOff[] = "off";
+const char kScreenMagnifierFull[] = "full";
+const char kScreenMagnifierPartial[] = "partial";
+}
+
 BrowserOptionsHandler::BrowserOptionsHandler()
     : template_url_service_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_for_file_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_for_ui_(this)) {
   multiprofile_ = ProfileManager::IsMultipleProfilesEnabled();
 #if !defined(OS_MACOSX)
   default_browser_worker_ = new ShellIntegration::DefaultBrowserWorker(this);
 #endif
 #if(!defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN))
   // On Windows, we need the PDF plugin which is only guaranteed to exist on
@@ skipping 150 matching lines @@
     { "themesSetClassic", IDS_THEMES_SET_CLASSIC },
 #else
     { "themes", IDS_THEMES_GROUP_NAME },
     { "themesReset", IDS_THEMES_RESET_BUTTON },
 #endif
 #if defined(OS_CHROMEOS)
     { "accessibilityHighContrast",
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_HIGH_CONTRAST_DESCRIPTION },
     { "accessibilityScreenMagnifier",
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_DESCRIPTION },
+    { "accessibilityScreenMagnifierOff",
+      IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_OFF },
+    { "accessibilityScreenMagnifierFull",
+      IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL },
+    { "accessibilityScreenMagnifierPartial",
+      IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL },
     { "accessibilitySpokenFeedback",
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_DESCRIPTION },
     { "accessibilityTitle",
       IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY },
     { "accessibilityVirtualKeyboard",
       IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION },
     { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET },
     { "factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON },
     { "factoryResetDataRestart", IDS_RELAUNCH_BUTTON },
     { "changePicture", IDS_OPTIONS_CHANGE_PICTURE_CAPTION },
@@ skipping 950 matching lines @@
 
 void BrowserOptionsHandler::HighContrastChangeCallback(const ListValue* args) {
   bool enabled = false;
   args->GetBoolean(0, &enabled);
 
   chromeos::accessibility::EnableHighContrast(enabled);
 }
 
 void BrowserOptionsHandler::ScreenMagnifierChangeCallback(
     const ListValue* args) {
-  bool enabled = false;
-  args->GetBoolean(0, &enabled);
+  std::string type_name;
+  args->GetString(0, &type_name);
 
-  chromeos::accessibility::EnableScreenMagnifier(enabled);
+  chromeos::accessibility::ScreenMagnifierType type =
+      chromeos::accessibility::MagnifierNone;
+
+  if (type_name == kScreenMagnifierFull)
+    type = chromeos::accessibility::MagnifierFull;
+  else if (type_name == kScreenMagnifierPartial)
+    type = chromeos::accessibility::MagnifierPartial;
+
+  chromeos::accessibility::SetScreenMagnifier(type);
 }
 
 void BrowserOptionsHandler::VirtualKeyboardChangeCallback(
     const ListValue* args) {
   bool enabled = false;
   args->GetBoolean(0, &enabled);
 
   chromeos::accessibility::EnableVirtualKeyboard(enabled);
 }
 
@@ skipping 19 matching lines @@
   base::FundamentalValue spoken_feedback_enabled(
       pref_service->GetBoolean(prefs::kSpokenFeedbackEnabled));
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setSpokenFeedbackCheckboxState",
       spoken_feedback_enabled);
   base::FundamentalValue high_contrast_enabled(
       pref_service->GetBoolean(prefs::kHighContrastEnabled));
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setHighContrastCheckboxState",
       high_contrast_enabled);
-  base::FundamentalValue screen_magnifier_enabled(
-      pref_service->GetBoolean(prefs::kScreenMagnifierEnabled));
+
+  std::string type(kScreenMagnifierOff);
+  if (pref_service->GetBoolean(prefs::kScreenMagnifierEnabled))
+    type = kScreenMagnifierFull;
+  else if (pref_service->GetBoolean(prefs::kPartialScreenMagnifierEnabled))
+    type = kScreenMagnifierPartial;
+
+  base::StringValue magnifier_type(type);
   web_ui()->CallJavascriptFunction(
-      "BrowserOptions.setScreenMagnifierCheckboxState",
-      screen_magnifier_enabled);
+      "BrowserOptions.setScreenMagnifierTypeState",
+      magnifier_type);
+
   base::FundamentalValue virtual_keyboard_enabled(
       pref_service->GetBoolean(prefs::kVirtualKeyboardEnabled));
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setVirtualKeyboardCheckboxState",
       virtual_keyboard_enabled);
 }
 #endif
 
 void BrowserOptionsHandler::SetupMetricsReportingSettingVisibility() {
 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_CHROMEOS)
@@ skipping 89 matching lines @@
         l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   }
   StringValue label(label_str);
 
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setupProxySettingsSection", disabled, label);
 #endif  // !defined(OS_CHROMEOS)
 }
 
 }  // namespace options