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

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

Issue 382123004: Creates new 'settings' section, 'Voice'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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
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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 template_url_service_->RemoveObserver(this); 189 template_url_service_->RemoveObserver(this);
190 // There may be pending file dialogs, we need to tell them that we've gone 190 // There may be pending file dialogs, we need to tell them that we've gone
191 // away so they don't try and call back to us. 191 // away so they don't try and call back to us.
192 if (select_folder_dialog_.get()) 192 if (select_folder_dialog_.get())
193 select_folder_dialog_->ListenerDestroyed(); 193 select_folder_dialog_->ListenerDestroyed();
194 } 194 }
195 195
196 void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) { 196 void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
197 DCHECK(values); 197 DCHECK(values);
198 198
199 static OptionsStringResource resources[] = { 199 static OptionsStringResource resources[] = {
Matt Giuca 2014/07/11 04:09:55 I'm not sure why this file is not formatted proper
kcarattini 2014/07/11 05:00:35 Done.
200 { "advancedSectionTitleCloudPrint", IDS_GOOGLE_CLOUD_PRINT }, 200 {"advancedSectionTitleCloudPrint", IDS_GOOGLE_CLOUD_PRINT},
201 { "currentUserOnly", IDS_OPTIONS_CURRENT_USER_ONLY }, 201 {"currentUserOnly", IDS_OPTIONS_CURRENT_USER_ONLY},
202 { "advancedSectionTitleCertificates", 202 {"advancedSectionTitleCertificates",
203 IDS_OPTIONS_ADVANCED_SECTION_TITLE_CERTIFICATES }, 203 IDS_OPTIONS_ADVANCED_SECTION_TITLE_CERTIFICATES},
204 { "advancedSectionTitleContent", 204 {"advancedSectionTitleContent", IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT},
205 IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT }, 205 {"advancedSectionTitleLanguages",
206 { "advancedSectionTitleLanguages", 206 IDS_OPTIONS_ADVANCED_SECTION_TITLE_LANGUAGES},
207 IDS_OPTIONS_ADVANCED_SECTION_TITLE_LANGUAGES }, 207 {"advancedSectionTitleNetwork", IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK},
208 { "advancedSectionTitleNetwork", 208 {"advancedSectionTitlePrivacy", IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY},
209 IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK }, 209 {"autofillEnabled", IDS_OPTIONS_AUTOFILL_ENABLE},
210 { "advancedSectionTitlePrivacy", 210 {"autologinEnabled", IDS_OPTIONS_PASSWORDS_AUTOLOGIN},
211 IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY }, 211 {"autoOpenFileTypesInfo", IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY},
212 { "autofillEnabled", IDS_OPTIONS_AUTOFILL_ENABLE }, 212 {"autoOpenFileTypesResetToDefault",
213 { "autologinEnabled", IDS_OPTIONS_PASSWORDS_AUTOLOGIN }, 213 IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT},
214 { "autoOpenFileTypesInfo", IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY }, 214 {"changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE},
215 { "autoOpenFileTypesResetToDefault", 215 {"certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON},
216 IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT }, 216 {"customizeSync", IDS_OPTIONS_CUSTOMIZE_SYNC_BUTTON_LABEL},
217 { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE }, 217 {"defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL},
218 { "certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON }, 218 {"defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES},
219 { "customizeSync", IDS_OPTIONS_CUSTOMIZE_SYNC_BUTTON_LABEL }, 219 {"defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL},
220 { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL }, 220 #if defined(OS_CHROMEOS)
221 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES }, 221 {"disableGData", IDS_OPTIONS_DISABLE_GDATA},
222 { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL }, 222 #endif
223 #if defined(OS_CHROMEOS) 223 {"disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES},
224 { "disableGData", IDS_OPTIONS_DISABLE_GDATA }, 224 #if defined(OS_CHROMEOS)
225 #endif 225 {"displayOptions", IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_BUTTON_LABEL},
226 { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES }, 226 #endif
227 #if defined(OS_CHROMEOS) 227 {"doNotTrack", IDS_OPTIONS_ENABLE_DO_NOT_TRACK},
228 { "displayOptions", 228 {"doNotTrackConfirmMessage", IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TEXT},
229 IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_BUTTON_LABEL }, 229 {"doNotTrackConfirmEnable", IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_ENABLE},
230 #endif 230 {"doNotTrackConfirmDisable",
231 { "doNotTrack", IDS_OPTIONS_ENABLE_DO_NOT_TRACK }, 231 IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_DISABLE},
232 { "doNotTrackConfirmMessage", IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TEXT }, 232 {"downloadLocationAskForSaveLocation",
233 { "doNotTrackConfirmEnable", 233 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION},
234 IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_ENABLE }, 234 {"downloadLocationBrowseTitle", IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE},
235 { "doNotTrackConfirmDisable", 235 {"downloadLocationChangeButton",
236 IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_DISABLE }, 236 IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON},
237 { "downloadLocationAskForSaveLocation", 237 {"downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME},
238 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION }, 238 {"enableLogging", IDS_OPTIONS_ENABLE_LOGGING},
239 { "downloadLocationBrowseTitle",
240 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE },
241 { "downloadLocationChangeButton",
242 IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON },
243 { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME },
244 { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING },
245 #if !defined(OS_CHROMEOS) 239 #if !defined(OS_CHROMEOS)
246 { "easyUnlockCheckboxLabel", IDS_OPTIONS_EASY_UNLOCK_CHECKBOX_LABEL }, 240 {"easyUnlockCheckboxLabel", IDS_OPTIONS_EASY_UNLOCK_CHECKBOX_LABEL},
247 #endif 241 #endif
248 { "easyUnlockSectionTitle", IDS_OPTIONS_EASY_UNLOCK_SECTION_TITLE }, 242 {"easyUnlockSectionTitle", IDS_OPTIONS_EASY_UNLOCK_SECTION_TITLE},
249 { "easyUnlockSetupButton", IDS_OPTIONS_EASY_UNLOCK_SETUP_BUTTON }, 243 {"easyUnlockSetupButton", IDS_OPTIONS_EASY_UNLOCK_SETUP_BUTTON},
250 { "easyUnlockManagement", IDS_OPTIONS_EASY_UNLOCK_MANAGEMENT }, 244 {"easyUnlockManagement", IDS_OPTIONS_EASY_UNLOCK_MANAGEMENT},
251 { "extensionControlled", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED }, 245 {"extensionControlled", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED},
252 { "extensionDisable", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED_DISABLE }, 246 {"extensionDisable", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED_DISABLE},
253 { "fontSettingsCustomizeFontsButton", 247 {"fontSettingsCustomizeFontsButton",
254 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON }, 248 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON},
255 { "fontSizeLabelCustom", IDS_OPTIONS_FONT_SIZE_LABEL_CUSTOM }, 249 {"fontSizeLabelCustom", IDS_OPTIONS_FONT_SIZE_LABEL_CUSTOM},
256 { "fontSizeLabelLarge", IDS_OPTIONS_FONT_SIZE_LABEL_LARGE }, 250 {"fontSizeLabelLarge", IDS_OPTIONS_FONT_SIZE_LABEL_LARGE},
257 { "fontSizeLabelMedium", IDS_OPTIONS_FONT_SIZE_LABEL_MEDIUM }, 251 {"fontSizeLabelMedium", IDS_OPTIONS_FONT_SIZE_LABEL_MEDIUM},
258 { "fontSizeLabelSmall", IDS_OPTIONS_FONT_SIZE_LABEL_SMALL }, 252 {"fontSizeLabelSmall", IDS_OPTIONS_FONT_SIZE_LABEL_SMALL},
259 { "fontSizeLabelVeryLarge", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_LARGE }, 253 {"fontSizeLabelVeryLarge", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_LARGE},
260 { "fontSizeLabelVerySmall", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_SMALL }, 254 {"fontSizeLabelVerySmall", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_SMALL},
261 { "hideAdvancedSettings", IDS_SETTINGS_HIDE_ADVANCED_SETTINGS }, 255 {"hideAdvancedSettings", IDS_SETTINGS_HIDE_ADVANCED_SETTINGS},
262 { "homePageNtp", IDS_OPTIONS_HOMEPAGE_NTP }, 256 {"homePageNtp", IDS_OPTIONS_HOMEPAGE_NTP},
263 { "homePageShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, 257 {"homePageShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON},
264 { "homePageUseNewTab", IDS_OPTIONS_HOMEPAGE_USE_NEWTAB }, 258 {"homePageUseNewTab", IDS_OPTIONS_HOMEPAGE_USE_NEWTAB},
265 { "homePageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL }, 259 {"homePageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL},
266 { "hotwordSearchEnable", IDS_HOTWORD_SEARCH_PREF_CHKBOX }, 260 {"hotwordSearchEnable", IDS_HOTWORD_SEARCH_PREF_CHKBOX},
267 { "hotwordConfirmEnable", IDS_HOTWORD_CONFIRM_BUBBLE_ENABLE }, 261 {"hotwordConfirmEnable", IDS_HOTWORD_CONFIRM_BUBBLE_ENABLE},
268 { "hotwordConfirmDisable", IDS_HOTWORD_CONFIRM_BUBBLE_DISABLE }, 262 {"hotwordConfirmDisable", IDS_HOTWORD_CONFIRM_BUBBLE_DISABLE},
269 { "hotwordConfirmMessage", IDS_HOTWORD_SEARCH_PREF_DESCRIPTION }, 263 {"hotwordConfirmMessage", IDS_HOTWORD_SEARCH_PREF_DESCRIPTION},
270 { "hotwordAudioLoggingEnable", IDS_HOTWORD_AUDIO_LOGGING_ENABLE }, 264 {"hotwordAudioLoggingEnable", IDS_HOTWORD_AUDIO_LOGGING_ENABLE},
271 { "importData", IDS_OPTIONS_IMPORT_DATA_BUTTON }, 265 {"importData", IDS_OPTIONS_IMPORT_DATA_BUTTON},
272 { "improveBrowsingExperience", IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE }, 266 {"improveBrowsingExperience", IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE},
273 { "languageAndSpellCheckSettingsButton", 267 {"languageAndSpellCheckSettingsButton",
274 IDS_OPTIONS_SETTINGS_LANGUAGE_AND_INPUT_SETTINGS }, 268 IDS_OPTIONS_SETTINGS_LANGUAGE_AND_INPUT_SETTINGS},
275 { "linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF }, 269 {"linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF},
276 { "manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK }, 270 {"manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK},
277 { "manageLanguages", IDS_OPTIONS_TRANSLATE_MANAGE_LANGUAGES }, 271 {"manageLanguages", IDS_OPTIONS_TRANSLATE_MANAGE_LANGUAGES},
278 { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK }, 272 {"managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK},
279 { "managedUserLabel", IDS_SUPERVISED_USER_AVATAR_LABEL }, 273 {"managedUserLabel", IDS_SUPERVISED_USER_AVATAR_LABEL},
280 { "networkPredictionEnabledDescription", 274 {"networkPredictionEnabledDescription",
281 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION }, 275 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION},
282 { "passwordsAndAutofillGroupName", 276 {"passwordsAndAutofillGroupName",
283 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME }, 277 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME},
284 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE }, 278 {"passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE},
285 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON }, 279 {"privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON},
286 { "privacyContentSettingsButton", 280 {"privacyContentSettingsButton",
287 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON }, 281 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON},
288 { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL }, 282 {"profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL},
289 { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL }, 283 {"profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL},
290 { "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL }, 284 {"profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL},
291 { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT }, 285 {"profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT},
292 { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL }, 286 {"profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL},
293 { "profilesSupervisedDashboardTip", 287 {"profilesSupervisedDashboardTip",
294 IDS_PROFILES_SUPERVISED_USER_DASHBOARD_TIP }, 288 IDS_PROFILES_SUPERVISED_USER_DASHBOARD_TIP},
295 #if defined(ENABLE_SETTINGS_APP) 289 #if defined(ENABLE_SETTINGS_APP)
296 { "profilesAppListSwitch", IDS_SETTINGS_APP_PROFILES_SWITCH_BUTTON_LABEL }, 290 {"profilesAppListSwitch", IDS_SETTINGS_APP_PROFILES_SWITCH_BUTTON_LABEL},
297 #endif 291 #endif
298 { "proxiesLabelExtension", IDS_OPTIONS_EXTENSION_PROXIES_LABEL }, 292 {"proxiesLabelExtension", IDS_OPTIONS_EXTENSION_PROXIES_LABEL},
299 { "proxiesLabelSystem", IDS_OPTIONS_SYSTEM_PROXIES_LABEL, 293 {"proxiesLabelSystem", IDS_OPTIONS_SYSTEM_PROXIES_LABEL, IDS_PRODUCT_NAME},
300 IDS_PRODUCT_NAME }, 294 {"resetProfileSettings", IDS_RESET_PROFILE_SETTINGS_BUTTON},
301 { "resetProfileSettings", IDS_RESET_PROFILE_SETTINGS_BUTTON }, 295 {"resetProfileSettingsDescription", IDS_RESET_PROFILE_SETTINGS_DESCRIPTION},
302 { "resetProfileSettingsDescription", 296 {"resetProfileSettingsSectionTitle",
303 IDS_RESET_PROFILE_SETTINGS_DESCRIPTION }, 297 IDS_RESET_PROFILE_SETTINGS_SECTION_TITLE},
304 { "resetProfileSettingsSectionTitle", 298 {"safeBrowsingEnableProtection", IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION},
305 IDS_RESET_PROFILE_SETTINGS_SECTION_TITLE }, 299 {"safeBrowsingEnableExtendedReporting",
306 { "safeBrowsingEnableProtection", 300 IDS_OPTIONS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING},
307 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION }, 301 {"sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME},
308 { "safeBrowsingEnableExtendedReporting", 302 {"sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME},
309 IDS_OPTIONS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING }, 303 {"sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME},
310 { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME }, 304 {"sectionTitleProxy", IDS_OPTIONS_PROXY_GROUP_NAME},
311 { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME }, 305 {"sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME},
312 { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME }, 306 {"sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME},
313 { "sectionTitleProxy", IDS_OPTIONS_PROXY_GROUP_NAME }, 307 {"sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME},
314 { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME }, 308 {"sectionTitleVoice", IDS_OPTIONS_VOICE_GROUP_NAME},
315 { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME }, 309 {"spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT},
316 { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME }, 310 {"spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE},
317 { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT }, 311 {"spellingConfirmDisable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE},
318 { "spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE }, 312 {"spellingPref", IDS_OPTIONS_SPELLING_PREF},
319 { "spellingConfirmDisable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE }, 313 {"startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION},
320 { "spellingPref", IDS_OPTIONS_SPELLING_PREF }, 314 {"settingsTitle", IDS_SETTINGS_TITLE},
321 { "startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION }, 315 {"showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS},
322 { "settingsTitle", IDS_SETTINGS_TITLE }, 316 {"startupSetPages", IDS_OPTIONS_STARTUP_SET_PAGES},
323 { "showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS }, 317 {"startupShowNewTab", IDS_OPTIONS_STARTUP_SHOW_NEWTAB},
324 { "startupSetPages", IDS_OPTIONS_STARTUP_SET_PAGES }, 318 {"startupShowPages", IDS_OPTIONS_STARTUP_SHOW_PAGES},
325 { "startupShowNewTab", IDS_OPTIONS_STARTUP_SHOW_NEWTAB }, 319 {"suggestPref", IDS_OPTIONS_SUGGEST_PREF},
326 { "startupShowPages", IDS_OPTIONS_STARTUP_SHOW_PAGES }, 320 {"syncButtonTextInProgress", IDS_SYNC_NTP_SETUP_IN_PROGRESS},
327 { "suggestPref", IDS_OPTIONS_SUGGEST_PREF }, 321 {"syncButtonTextStop", IDS_SYNC_STOP_SYNCING_BUTTON_LABEL},
328 { "syncButtonTextInProgress", IDS_SYNC_NTP_SETUP_IN_PROGRESS }, 322 {"themesGallery", IDS_THEMES_GALLERY_BUTTON},
329 { "syncButtonTextStop", IDS_SYNC_STOP_SYNCING_BUTTON_LABEL }, 323 {"themesGalleryURL", IDS_THEMES_GALLERY_URL},
330 { "themesGallery", IDS_THEMES_GALLERY_BUTTON }, 324 {"tabsToLinksPref", IDS_OPTIONS_TABS_TO_LINKS_PREF},
331 { "themesGalleryURL", IDS_THEMES_GALLERY_URL }, 325 {"toolbarShowBookmarksBar", IDS_OPTIONS_TOOLBAR_SHOW_BOOKMARKS_BAR},
332 { "tabsToLinksPref", IDS_OPTIONS_TABS_TO_LINKS_PREF }, 326 {"toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON},
333 { "toolbarShowBookmarksBar", IDS_OPTIONS_TOOLBAR_SHOW_BOOKMARKS_BAR }, 327 {"translateEnableTranslate", IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE},
334 { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
335 { "translateEnableTranslate",
336 IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
337 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 328 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
338 { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, 329 {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
339 { "themesNativeButton", IDS_THEMES_GTK_BUTTON }, 330 {"themesNativeButton", IDS_THEMES_GTK_BUTTON},
340 { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, 331 {"themesSetClassic", IDS_THEMES_SET_CLASSIC},
341 #else 332 #else
342 { "themes", IDS_THEMES_GROUP_NAME }, 333 {"themes", IDS_THEMES_GROUP_NAME},
343 #endif 334 #endif
344 { "themesReset", IDS_THEMES_RESET_BUTTON }, 335 {"themesReset", IDS_THEMES_RESET_BUTTON},
345 #if defined(OS_CHROMEOS) 336 #if defined(OS_CHROMEOS)
346 { "accessibilityExplanation", 337 {"accessibilityExplanation",
347 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_EXPLANATION }, 338 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_EXPLANATION},
348 { "accessibilitySettings", 339 {"accessibilitySettings", IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SETTINGS},
349 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SETTINGS }, 340 {"accessibilityHighContrast",
350 { "accessibilityHighContrast", 341 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_HIGH_CONTRAST_DESCRIPTION},
351 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_HIGH_CONTRAST_DESCRIPTION }, 342 {"accessibilityScreenMagnifier",
352 { "accessibilityScreenMagnifier", 343 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_DESCRIPTION},
353 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_DESCRIPTION }, 344 {"accessibilityTapDragging",
354 { "accessibilityTapDragging", 345 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION},
355 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION }, 346 {"accessibilityScreenMagnifierOff",
356 { "accessibilityScreenMagnifierOff", 347 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_OFF},
357 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_OFF }, 348 {"accessibilityScreenMagnifierFull",
358 { "accessibilityScreenMagnifierFull", 349 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL},
359 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL }, 350 {"accessibilityScreenMagnifierPartial",
360 { "accessibilityScreenMagnifierPartial", 351 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL},
361 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL }, 352 {"accessibilityLargeCursor",
362 { "accessibilityLargeCursor", 353 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_LARGE_CURSOR_DESCRIPTION},
363 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_LARGE_CURSOR_DESCRIPTION }, 354 {"accessibilityStickyKeys",
364 { "accessibilityStickyKeys", 355 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_STICKY_KEYS_DESCRIPTION},
365 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_STICKY_KEYS_DESCRIPTION }, 356 {"accessibilitySpokenFeedback",
366 { "accessibilitySpokenFeedback", 357 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SPOKEN_FEEDBACK_DESCRIPTION},
367 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SPOKEN_FEEDBACK_DESCRIPTION }, 358 {"accessibilityTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY},
368 { "accessibilityTitle", 359 {"accessibilityVirtualKeyboard",
369 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY }, 360 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION},
370 { "accessibilityVirtualKeyboard", 361 {"accessibilityAlwaysShowMenu",
371 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION }, 362 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SHOULD_ALWAYS_SHOW_MENU},
372 { "accessibilityAlwaysShowMenu", 363 {"accessibilityAutoclick",
373 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SHOULD_ALWAYS_SHOW_MENU }, 364 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DESCRIPTION},
374 { "accessibilityAutoclick", 365 {"accessibilityAutoclickDropdown",
375 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DESCRIPTION }, 366 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DROPDOWN_DESCRIPTION},
376 { "accessibilityAutoclickDropdown", 367 {"autoclickDelayExtremelyShort",
377 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DROPDOWN_DESCRIPTION }, 368 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT},
378 { "autoclickDelayExtremelyShort", 369 {"autoclickDelayVeryShort",
379 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT }, 370 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT},
380 { "autoclickDelayVeryShort", 371 {"autoclickDelayShort",
381 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT }, 372 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_SHORT},
382 { "autoclickDelayShort", 373 {"autoclickDelayLong",
383 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_SHORT }, 374 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_LONG},
384 { "autoclickDelayLong", 375 {"autoclickDelayVeryLong",
385 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_LONG }, 376 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG},
386 { "autoclickDelayVeryLong", 377 {"consumerManagementDescription",
387 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG }, 378 IDS_OPTIONS_CONSUMER_MANAGEMENT_DESCRIPTION},
388 { "consumerManagementDescription", 379 {"consumerManagementEnrollButton",
389 IDS_OPTIONS_CONSUMER_MANAGEMENT_DESCRIPTION }, 380 IDS_OPTIONS_CONSUMER_MANAGEMENT_ENROLL_BUTTON},
390 { "consumerManagementEnrollButton", 381 {"consumerManagementUnenrollButton",
391 IDS_OPTIONS_CONSUMER_MANAGEMENT_ENROLL_BUTTON }, 382 IDS_OPTIONS_CONSUMER_MANAGEMENT_UNENROLL_BUTTON},
392 { "consumerManagementUnenrollButton", 383 {"deviceControlTitle", IDS_OPTIONS_DEVICE_CONTROL_SECTION_TITLE},
393 IDS_OPTIONS_CONSUMER_MANAGEMENT_UNENROLL_BUTTON }, 384 {"enableContentProtectionAttestation",
394 { "deviceControlTitle", IDS_OPTIONS_DEVICE_CONTROL_SECTION_TITLE }, 385 IDS_OPTIONS_ENABLE_CONTENT_PROTECTION_ATTESTATION},
395 { "enableContentProtectionAttestation", 386 {"factoryResetHeading", IDS_OPTIONS_FACTORY_RESET_HEADING},
396 IDS_OPTIONS_ENABLE_CONTENT_PROTECTION_ATTESTATION }, 387 {"factoryResetTitle", IDS_OPTIONS_FACTORY_RESET},
397 { "factoryResetHeading", IDS_OPTIONS_FACTORY_RESET_HEADING }, 388 {"factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON},
398 { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET }, 389 {"factoryResetDataRestart", IDS_RELAUNCH_BUTTON},
399 { "factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON }, 390 {"factoryResetWarning", IDS_OPTIONS_FACTORY_RESET_WARNING},
400 { "factoryResetDataRestart", IDS_RELAUNCH_BUTTON }, 391 {"factoryResetHelpUrl", IDS_FACTORY_RESET_HELP_URL},
401 { "factoryResetWarning", IDS_OPTIONS_FACTORY_RESET_WARNING }, 392 {"changePicture", IDS_OPTIONS_CHANGE_PICTURE},
402 { "factoryResetHelpUrl", IDS_FACTORY_RESET_HELP_URL }, 393 {"changePictureCaption", IDS_OPTIONS_CHANGE_PICTURE_CAPTION},
403 { "changePicture", IDS_OPTIONS_CHANGE_PICTURE }, 394 {"datetimeTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME},
404 { "changePictureCaption", IDS_OPTIONS_CHANGE_PICTURE_CAPTION }, 395 {"deviceGroupDescription", IDS_OPTIONS_DEVICE_GROUP_DESCRIPTION},
405 { "datetimeTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME }, 396 {"deviceGroupPointer", IDS_OPTIONS_DEVICE_GROUP_POINTER_SECTION},
406 { "deviceGroupDescription", IDS_OPTIONS_DEVICE_GROUP_DESCRIPTION }, 397 {"mouseSpeed", IDS_OPTIONS_SETTINGS_MOUSE_SPEED_DESCRIPTION},
407 { "deviceGroupPointer", IDS_OPTIONS_DEVICE_GROUP_POINTER_SECTION }, 398 {"touchpadSpeed", IDS_OPTIONS_SETTINGS_TOUCHPAD_SPEED_DESCRIPTION},
408 { "mouseSpeed", IDS_OPTIONS_SETTINGS_MOUSE_SPEED_DESCRIPTION }, 399 {"enableScreenlock", IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX},
409 { "touchpadSpeed", IDS_OPTIONS_SETTINGS_TOUCHPAD_SPEED_DESCRIPTION }, 400 {"internetOptionsButtonTitle", IDS_OPTIONS_INTERNET_OPTIONS_BUTTON_TITLE},
410 { "enableScreenlock", IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX }, 401 {"keyboardSettingsButtonTitle",
411 { "internetOptionsButtonTitle", IDS_OPTIONS_INTERNET_OPTIONS_BUTTON_TITLE }, 402 IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE},
412 { "keyboardSettingsButtonTitle", 403 {"manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE},
413 IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE }, 404 {"noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES},
414 { "manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE }, 405 {"sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME},
415 { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES }, 406 {"sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL},
416 { "sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME }, 407 {"syncOverview", IDS_SYNC_OVERVIEW},
417 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL }, 408 {"syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL},
418 { "syncOverview", IDS_SYNC_OVERVIEW }, 409 {"thirdPartyImeConfirmEnable", IDS_OK},
419 { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL }, 410 {"thirdPartyImeConfirmDisable", IDS_CANCEL},
420 { "thirdPartyImeConfirmEnable", IDS_OK }, 411 {"thirdPartyImeConfirmMessage",
421 { "thirdPartyImeConfirmDisable", IDS_CANCEL }, 412 IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_MESSAGE},
422 { "thirdPartyImeConfirmMessage", 413 {"timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION},
423 IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_MESSAGE }, 414 {"use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION},
424 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION },
425 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION },
426 #else 415 #else
427 { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON }, 416 {"proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON},
428 #endif 417 #endif
429 #if defined(OS_CHROMEOS) && defined(USE_ASH) 418 #if defined(OS_CHROMEOS) && defined(USE_ASH)
430 { "setWallpaper", IDS_SET_WALLPAPER_BUTTON }, 419 {"setWallpaper", IDS_SET_WALLPAPER_BUTTON},
431 #endif 420 #endif
432 { "advancedSectionTitleSystem", 421 {"advancedSectionTitleSystem", IDS_OPTIONS_ADVANCED_SECTION_TITLE_SYSTEM},
433 IDS_OPTIONS_ADVANCED_SECTION_TITLE_SYSTEM },
434 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 422 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
435 { "backgroundModeCheckbox", IDS_OPTIONS_SYSTEM_ENABLE_BACKGROUND_MODE }, 423 {"backgroundModeCheckbox", IDS_OPTIONS_SYSTEM_ENABLE_BACKGROUND_MODE},
436 #endif 424 #endif
437 #if !defined(OS_CHROMEOS) 425 #if !defined(OS_CHROMEOS)
438 { "gpuModeCheckbox", 426 {"gpuModeCheckbox", IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE},
439 IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE }, 427 {"gpuModeResetRestart",
440 { "gpuModeResetRestart", 428 IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE_RESTART},
441 IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE_RESTART },
442 // Strings with product-name substitutions. 429 // Strings with product-name substitutions.
443 { "syncOverview", IDS_SYNC_OVERVIEW, IDS_PRODUCT_NAME }, 430 {"syncOverview", IDS_SYNC_OVERVIEW, IDS_PRODUCT_NAME},
444 { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL }, 431 {"syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL},
445 #endif 432 #endif
446 { "syncButtonTextSignIn", IDS_SYNC_START_SYNC_BUTTON_LABEL, 433 {"syncButtonTextSignIn", IDS_SYNC_START_SYNC_BUTTON_LABEL,
447 IDS_SHORT_PRODUCT_NAME }, 434 IDS_SHORT_PRODUCT_NAME},
448 { "profilesSingleUser", IDS_PROFILES_SINGLE_USER_MESSAGE, 435 {"profilesSingleUser", IDS_PROFILES_SINGLE_USER_MESSAGE, IDS_PRODUCT_NAME},
449 IDS_PRODUCT_NAME }, 436 {"defaultBrowserUnknown", IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN,
450 { "defaultBrowserUnknown", IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN, 437 IDS_PRODUCT_NAME},
451 IDS_PRODUCT_NAME }, 438 {"defaultBrowserUseAsDefault", IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT},
452 { "defaultBrowserUseAsDefault", IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT }, 439 {"autoLaunchText", IDS_AUTOLAUNCH_TEXT},
453 { "autoLaunchText", IDS_AUTOLAUNCH_TEXT }, 440 #if defined(OS_CHROMEOS)
454 #if defined(OS_CHROMEOS) 441 {"factoryResetDescription", IDS_OPTIONS_FACTORY_RESET_DESCRIPTION,
455 { "factoryResetDescription", IDS_OPTIONS_FACTORY_RESET_DESCRIPTION, 442 IDS_SHORT_PRODUCT_NAME},
456 IDS_SHORT_PRODUCT_NAME }, 443 #endif
457 #endif 444 {"languageSectionLabel", IDS_OPTIONS_ADVANCED_LANGUAGE_LABEL,
458 { "languageSectionLabel", IDS_OPTIONS_ADVANCED_LANGUAGE_LABEL, 445 IDS_SHORT_PRODUCT_NAME},
459 IDS_SHORT_PRODUCT_NAME },
460 #if defined(ENABLE_SERVICE_DISCOVERY) 446 #if defined(ENABLE_SERVICE_DISCOVERY)
461 { "cloudPrintDevicesPageButton", IDS_LOCAL_DISCOVERY_DEVICES_PAGE_BUTTON }, 447 {"cloudPrintDevicesPageButton", IDS_LOCAL_DISCOVERY_DEVICES_PAGE_BUTTON},
462 { "cloudPrintEnableNotificationsLabel", 448 {"cloudPrintEnableNotificationsLabel",
463 IDS_LOCAL_DISCOVERY_NOTIFICATIONS_ENABLE_CHECKBOX_LABEL }, 449 IDS_LOCAL_DISCOVERY_NOTIFICATIONS_ENABLE_CHECKBOX_LABEL},
464 #endif 450 #endif
465 }; 451 };
466 452
467 #if defined(ENABLE_SETTINGS_APP) 453 #if defined(ENABLE_SETTINGS_APP)
468 static OptionsStringResource app_resources[] = { 454 static OptionsStringResource app_resources[] = {
469 { "syncOverview", IDS_SETTINGS_APP_SYNC_OVERVIEW }, 455 { "syncOverview", IDS_SETTINGS_APP_SYNC_OVERVIEW },
470 { "syncButtonTextStart", IDS_SYNC_START_SYNC_BUTTON_LABEL, 456 { "syncButtonTextStart", IDS_SYNC_START_SYNC_BUTTON_LABEL,
471 IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME }, 457 IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME },
472 { "profilesSingleUser", IDS_PROFILES_SINGLE_USER_MESSAGE, 458 { "profilesSingleUser", IDS_PROFILES_SINGLE_USER_MESSAGE,
473 IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME }, 459 IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME },
(...skipping 1326 matching lines...) Expand 10 before | Expand all | Expand 10 after
1800 extension = extensions::GetExtensionOverridingProxy( 1786 extension = extensions::GetExtensionOverridingProxy(
1801 Profile::FromWebUI(web_ui())); 1787 Profile::FromWebUI(web_ui()));
1802 AppendExtensionData("proxy", extension, &extension_controlled); 1788 AppendExtensionData("proxy", extension, &extension_controlled);
1803 1789
1804 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", 1790 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
1805 extension_controlled); 1791 extension_controlled);
1806 #endif // defined(OS_WIN) 1792 #endif // defined(OS_WIN)
1807 } 1793 }
1808 1794
1809 } // namespace options 1795 } // namespace options
OLDNEW
« chrome/app/generated_resources.grd ('K') | « chrome/browser/resources/options/browser_options.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698