Re-introduce the partial magnifier

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 67 matching lines @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h"
 #include "chrome/browser/ui/webui/options/advanced_options_utils.h"
 #endif
 
 #if defined(OS_CHROMEOS)
+#include "ash/magnifier/magnifier_constants.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/options/chromeos/timezone_options_util.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "ui/gfx/image/image_skia.h"
@@ skipping 322 matching lines @@
 
 #if defined(OS_CHROMEOS)
   values->SetString("cloudPrintLearnMoreURL", chrome::kCloudPrintLearnMoreURL);
 
   // TODO(pastarmovj): replace this with a call to the CrosSettings list
   // handling functionality to come.
   values->Set("timezoneList", GetTimezoneList().release());
 
   values->SetString("accessibilityLearnMoreURL",
                     chrome::kChromeAccessibilityHelpURL);
+
+  // Creates magnifierList.
+  base::ListValue* magnifierList = new base::ListValue();

[Dan Beam, 2013/01/11 00:34:23]

nit: magnifier_list (C++ is var_name not varName)

+  base::ListValue* option_full = new base::ListValue();
+  option_full->Append(base::Value::CreateIntegerValue(ash::MAGNIFIER_FULL));

[Dan Beam, 2013/01/11 00:34:23]

nit: I think base::Value::Create* functions are deprecated / being removed.

+  option_full->Append(new base::StringValue(l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL)));
+  base::ListValue* option_partial = new base::ListValue();
+  option_partial->Append(base::Value::CreateIntegerValue(
+      ash::MAGNIFIER_PARTIAL));
+  option_partial->Append(new base::StringValue(l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL)));
+  magnifierList->Append(option_full);

[Dan Beam, 2013/01/11 00:34:23]

totally optional nit: I'd put some visual separation because each list creation
and consider using scoped_ptr<>s, i.e.:

  scoped_ptr<base::ListValue> magnifier_list(new base::ListValue);
  
  scoped_ptr<base::ListValue> option_full(new base::ListValue);
  option_full->Append(
      new base::Value::IntegerValue(ash::MAGNIFIER_FULL));
  magnifier_list->Append(option_full.release());
  
  scoped_ptr<base::ListValue> option_partial(new base::ListValue);
  option_partial->Append(
      new base::Value::IntegerValue(ash::MAGNIFIER_PARTIAL));
  option_partial->Append(new base::StringValue(l10n_util::GetStringUTF16(
      IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL))
  magnifier_list->Append(option_partial);

  values->Set("magnifierList", magnifier_list.release());

+  magnifierList->Append(option_partial);
+  values->Set("magnifierList", magnifierList);
+
 #endif
 #if defined(OS_MACOSX)
   values->SetString("macPasswordsWarning",
       l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING));
   values->SetBoolean("multiple_profiles",
       g_browser_process->profile_manager()->GetNumberOfProfiles() > 1);
 #endif
 
   if (multiprofile_)
     values->Set("profilesInfo", GetProfilesInfoList().release());
@@ skipping 956 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