| 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 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 #else | 342 #else |
| 343 { "cloudPrintConnectorEnabledManageButton", | 343 { "cloudPrintConnectorEnabledManageButton", |
| 344 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLED_MANAGE_BUTTON}, | 344 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLED_MANAGE_BUTTON}, |
| 345 { "cloudPrintConnectorEnablingButton", | 345 { "cloudPrintConnectorEnablingButton", |
| 346 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLING_BUTTON }, | 346 IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLING_BUTTON }, |
| 347 { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON }, | 347 { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON }, |
| 348 #endif | 348 #endif |
| 349 #if defined(OS_CHROMEOS) && defined(USE_ASH) | 349 #if defined(OS_CHROMEOS) && defined(USE_ASH) |
| 350 { "setWallpaper", IDS_SET_WALLPAPER_BUTTON }, | 350 { "setWallpaper", IDS_SET_WALLPAPER_BUTTON }, |
| 351 #endif | 351 #endif |
| 352 { "advancedSectionTitleSystem", |
| 353 IDS_OPTIONS_ADVANCED_SECTION_TITLE_SYSTEM }, |
| 352 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) | 354 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) |
| 353 { "advancedSectionTitleBackground", | 355 { "backgroundModeCheckbox", IDS_OPTIONS_SYSTEM_ENABLE_BACKGROUND_MODE }, |
| 354 IDS_OPTIONS_ADVANCED_SECTION_TITLE_BACKGROUND }, | |
| 355 { "backgroundModeCheckbox", IDS_OPTIONS_BACKGROUND_ENABLE_BACKGROUND_MODE }, | |
| 356 #endif | 356 #endif |
| 357 | 357 { "hardwareAccelerationModeCheckbox", |
| 358 IDS_OPTIONS_SYSTEM_ENABLE_HARDWARE_ACCELERATION_MODE }, |
| 358 // Strings with product-name substitutions. | 359 // Strings with product-name substitutions. |
| 359 #if !defined(OS_CHROMEOS) | 360 #if !defined(OS_CHROMEOS) |
| 360 { "syncOverview", IDS_SYNC_OVERVIEW, IDS_PRODUCT_NAME }, | 361 { "syncOverview", IDS_SYNC_OVERVIEW, IDS_PRODUCT_NAME }, |
| 361 { "syncButtonTextStart", IDS_SYNC_START_SYNC_BUTTON_LABEL, | 362 { "syncButtonTextStart", IDS_SYNC_START_SYNC_BUTTON_LABEL, |
| 362 IDS_SHORT_PRODUCT_NAME }, | 363 IDS_SHORT_PRODUCT_NAME }, |
| 363 #endif | 364 #endif |
| 364 { "profilesSingleUser", IDS_PROFILES_SINGLE_USER_MESSAGE, | 365 { "profilesSingleUser", IDS_PROFILES_SINGLE_USER_MESSAGE, |
| 365 IDS_PRODUCT_NAME }, | 366 IDS_PRODUCT_NAME }, |
| 366 { "defaultBrowserUnknown", IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN, | 367 { "defaultBrowserUnknown", IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN, |
| 367 IDS_PRODUCT_NAME }, | 368 IDS_PRODUCT_NAME }, |
| (...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1469 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() || | 1470 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() || |
| 1470 is_extension_controlled); | 1471 is_extension_controlled); |
| 1471 base::FundamentalValue extension_controlled(is_extension_controlled); | 1472 base::FundamentalValue extension_controlled(is_extension_controlled); |
| 1472 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection", | 1473 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection", |
| 1473 disabled, extension_controlled); | 1474 disabled, extension_controlled); |
| 1474 | 1475 |
| 1475 #endif // !defined(OS_CHROMEOS) | 1476 #endif // !defined(OS_CHROMEOS) |
| 1476 } | 1477 } |
| 1477 | 1478 |
| 1478 } // namespace options | 1479 } // namespace options |
| OLD | NEW |