Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 11642014: Re-introduce the partial magnifier (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix the build failure on win_aura Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index c4a25d7609fa1743e65382eb206ff4f733f50b3e..7b00522961fd847de4e63fba46bdd95ef0caf8ed 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -85,6 +85,7 @@
#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"
@@ -423,6 +424,22 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
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",
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698