Revert 176087

chrome/browser/ui/webui/options/browser_options_handler.cc

Index: chrome/browser/ui/webui/options/browser_options_handler.cc
===================================================================
--- chrome/browser/ui/webui/options/browser_options_handler.cc	(revision 176100)
+++ chrome/browser/ui/webui/options/browser_options_handler.cc	(working copy)
@@ -85,7 +85,6 @@
 #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"
@@ -424,22 +423,6 @@
 
   values->SetString("accessibilityLearnMoreURL",
                     chrome::kChromeAccessibilityHelpURL);
-
-  // Creates magnifierList.
-  base::ListValue* magnifierList = new base::ListValue();
-  base::ListValue* option_full = new base::ListValue();
-  option_full->Append(base::Value::CreateIntegerValue(ash::MAGNIFIER_FULL));
-  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);
-  magnifierList->Append(option_partial);
-  values->Set("magnifierList", magnifierList);
-
 #endif
 #if defined(OS_MACOSX)
   values->SetString("macPasswordsWarning",
Property changes on: chrome/browser/ui/webui/options/browser_options_handler.cc
___________________________________________________________________
Deleted: svn:mergeinfo