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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 475483003: Wire easy unlock settings UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win compile Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/app_window.h" 10 #include "apps/app_window.h"
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE }, 240 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE },
241 { "downloadLocationChangeButton", 241 { "downloadLocationChangeButton",
242 IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON }, 242 IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON },
243 { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME }, 243 { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME },
244 { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING }, 244 { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING },
245 { "metricsReportingResetRestart", IDS_OPTIONS_ENABLE_LOGGING_RESTART }, 245 { "metricsReportingResetRestart", IDS_OPTIONS_ENABLE_LOGGING_RESTART },
246 { "easyUnlockDescription", IDS_OPTIONS_EASY_UNLOCK_DESCRIPTION }, 246 { "easyUnlockDescription", IDS_OPTIONS_EASY_UNLOCK_DESCRIPTION },
247 { "easyUnlockSectionTitle", IDS_OPTIONS_EASY_UNLOCK_SECTION_TITLE }, 247 { "easyUnlockSectionTitle", IDS_OPTIONS_EASY_UNLOCK_SECTION_TITLE },
248 { "easyUnlockSetupButton", IDS_OPTIONS_EASY_UNLOCK_SETUP_BUTTON }, 248 { "easyUnlockSetupButton", IDS_OPTIONS_EASY_UNLOCK_SETUP_BUTTON },
249 { "easyUnlockSetupIntro", IDS_OPTIONS_EASY_UNLOCK_SETUP_INTRO }, 249 { "easyUnlockSetupIntro", IDS_OPTIONS_EASY_UNLOCK_SETUP_INTRO },
250 { "easyUnlockTurnOffButton", IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_BUTTON },
251 { "easyUnlockTurnOffTitle", IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_TITLE },
252 { "easyUnlockTurnOffDescription",
253 IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_DESCRIPTION },
254 { "easyUnlockTurnOffOfflineTitle",
255 IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_OFFLINE_TITLE },
256 { "easyUnlockTurnOffOfflineMessage",
257 IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_OFFLINE_MESSAGE },
258 { "easyUnlockTurnOffErrorTitle",
259 IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_ERROR_TITLE },
260 { "easyUnlockTurnOffErrorMessage",
261 IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_ERROR_MESSAGE },
262 { "easyUnlockTurnOffRetryButton",
263 IDS_OPTIONS_EASY_UNLOCK_TURN_OFF_RETRY_BUTTON },
264 { "extensionControlled", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED }, 250 { "extensionControlled", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED },
265 { "extensionDisable", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED_DISABLE }, 251 { "extensionDisable", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED_DISABLE },
266 { "fontSettingsCustomizeFontsButton", 252 { "fontSettingsCustomizeFontsButton",
267 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON }, 253 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON },
268 { "fontSizeLabelCustom", IDS_OPTIONS_FONT_SIZE_LABEL_CUSTOM }, 254 { "fontSizeLabelCustom", IDS_OPTIONS_FONT_SIZE_LABEL_CUSTOM },
269 { "fontSizeLabelLarge", IDS_OPTIONS_FONT_SIZE_LABEL_LARGE }, 255 { "fontSizeLabelLarge", IDS_OPTIONS_FONT_SIZE_LABEL_LARGE },
270 { "fontSizeLabelMedium", IDS_OPTIONS_FONT_SIZE_LABEL_MEDIUM }, 256 { "fontSizeLabelMedium", IDS_OPTIONS_FONT_SIZE_LABEL_MEDIUM },
271 { "fontSizeLabelSmall", IDS_OPTIONS_FONT_SIZE_LABEL_SMALL }, 257 { "fontSizeLabelSmall", IDS_OPTIONS_FONT_SIZE_LABEL_SMALL },
272 { "fontSizeLabelVeryLarge", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_LARGE }, 258 { "fontSizeLabelVeryLarge", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_LARGE },
273 { "fontSizeLabelVerySmall", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_SMALL }, 259 { "fontSizeLabelVerySmall", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_SMALL },
(...skipping 1591 matching lines...) Expand 10 before | Expand all | Expand 10 after
1865 extension = extensions::GetExtensionOverridingProxy( 1851 extension = extensions::GetExtensionOverridingProxy(
1866 Profile::FromWebUI(web_ui())); 1852 Profile::FromWebUI(web_ui()));
1867 AppendExtensionData("proxy", extension, &extension_controlled); 1853 AppendExtensionData("proxy", extension, &extension_controlled);
1868 1854
1869 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", 1855 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
1870 extension_controlled); 1856 extension_controlled);
1871 #endif // defined(OS_WIN) 1857 #endif // defined(OS_WIN)
1872 } 1858 }
1873 1859
1874 } // namespace options 1860 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698