| OLD | NEW |
| 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 "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 { "passwordGenerationEnabledDescription", | 231 { "passwordGenerationEnabledDescription", |
| 232 IDS_OPTIONS_PASSWORD_GENERATION_ENABLED_LABEL }, | 232 IDS_OPTIONS_PASSWORD_GENERATION_ENABLED_LABEL }, |
| 233 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON }, | 233 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON }, |
| 234 { "privacyContentSettingsButton", | 234 { "privacyContentSettingsButton", |
| 235 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON }, | 235 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON }, |
| 236 { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL }, | 236 { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL }, |
| 237 { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL }, | 237 { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL }, |
| 238 { "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL }, | 238 { "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL }, |
| 239 { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT }, | 239 { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT }, |
| 240 { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL }, | 240 { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL }, |
| 241 #if defined(ENABLE_SETTINGS_APP) |
| 242 { "profilesAppListSwitch", IDS_SETTINGS_APP_PROFILES_SWITCH_BUTTON_LABEL }, |
| 243 #endif |
| 241 { "proxiesLabel", IDS_OPTIONS_PROXIES_LABEL }, | 244 { "proxiesLabel", IDS_OPTIONS_PROXIES_LABEL }, |
| 242 { "safeBrowsingEnableProtection", | 245 { "safeBrowsingEnableProtection", |
| 243 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION }, | 246 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION }, |
| 244 { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME }, | 247 { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME }, |
| 245 { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME }, | 248 { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME }, |
| 246 { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME }, | 249 { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME }, |
| 247 { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME }, | 250 { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME }, |
| 248 { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME }, | 251 { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME }, |
| 249 { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME }, | 252 { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME }, |
| 250 { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT }, | 253 { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT }, |
| (...skipping 1158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1409 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 1412 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
| 1410 } | 1413 } |
| 1411 StringValue label(label_str); | 1414 StringValue label(label_str); |
| 1412 | 1415 |
| 1413 web_ui()->CallJavascriptFunction( | 1416 web_ui()->CallJavascriptFunction( |
| 1414 "BrowserOptions.setupProxySettingsSection", disabled, label); | 1417 "BrowserOptions.setupProxySettingsSection", disabled, label); |
| 1415 #endif // !defined(OS_CHROMEOS) | 1418 #endif // !defined(OS_CHROMEOS) |
| 1416 } | 1419 } |
| 1417 | 1420 |
| 1418 } // namespace options | 1421 } // namespace options |
| OLD | NEW |