Full Screen Magnifier: Add MagnificationManager

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 1278 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));
-  web_ui()->CallJavascriptFunction(
-      "BrowserOptions.setScreenMagnifierCheckboxState",
-      screen_magnifier_enabled);
   base::FundamentalValue virtual_keyboard_enabled(
       pref_service->GetBoolean(prefs::kVirtualKeyboardEnabled));
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setVirtualKeyboardCheckboxState",
       virtual_keyboard_enabled);
+
+  PrefService* user_pref_service = Profile::FromWebUI(web_ui())->GetPrefs();

[James Hawkins, 2012/10/11 15:42:33]

Can you explain this change?

[yoshiki, 2012/10/12 15:00:55]

This change makes the magnifier settings per-user instead of per-device. Added
this to the description.

+  base::FundamentalValue screen_magnifier_enabled(
+      user_pref_service->GetBoolean(prefs::kScreenMagnifierEnabled));
+  web_ui()->CallJavascriptFunction(
+      "BrowserOptions.setScreenMagnifierCheckboxState",
+      screen_magnifier_enabled);
 }
 #endif
 
 void BrowserOptionsHandler::SetupMetricsReportingSettingVisibility() {
 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_CHROMEOS)
   // Don't show the reporting setting if we are in the guest mode.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) {
     base::FundamentalValue visible(false);
     web_ui()->CallJavascriptFunction(
         "BrowserOptions.setMetricsReportingSettingVisibility", visible);
@@ skipping 84 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