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 "apps/app_window.h" | 10 #include "apps/app_window.h" |
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
406 { "internetOptionsButtonTitle", IDS_OPTIONS_INTERNET_OPTIONS_BUTTON_TITLE }, | 406 { "internetOptionsButtonTitle", IDS_OPTIONS_INTERNET_OPTIONS_BUTTON_TITLE }, |
407 { "keyboardSettingsButtonTitle", | 407 { "keyboardSettingsButtonTitle", |
408 IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE }, | 408 IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE }, |
409 { "manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE }, | 409 { "manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE }, |
410 { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES }, | 410 { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES }, |
411 { "sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME }, | 411 { "sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME }, |
412 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL }, | 412 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL }, |
413 { "securityTitle", IDS_OPTIONS_SECURITY_SECTION_TITLE }, | 413 { "securityTitle", IDS_OPTIONS_SECURITY_SECTION_TITLE }, |
414 { "syncOverview", IDS_SYNC_OVERVIEW }, | 414 { "syncOverview", IDS_SYNC_OVERVIEW }, |
415 { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL }, | 415 { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL }, |
| 416 { "thirdPartyImeConfirmEnable", IDS_OK }, |
| 417 { "thirdPartyImeConfirmDisable", IDS_CANCEL }, |
| 418 { "thirdPartyImeConfirmMessage", |
| 419 IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_MESSAGE }, |
416 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION }, | 420 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION }, |
417 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION }, | 421 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION }, |
418 #else | 422 #else |
419 { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON }, | 423 { "proxiesConfigureButton", IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON }, |
420 #endif | 424 #endif |
421 #if defined(OS_CHROMEOS) && defined(USE_ASH) | 425 #if defined(OS_CHROMEOS) && defined(USE_ASH) |
422 { "setWallpaper", IDS_SET_WALLPAPER_BUTTON }, | 426 { "setWallpaper", IDS_SET_WALLPAPER_BUTTON }, |
423 #endif | 427 #endif |
424 { "advancedSectionTitleSystem", | 428 { "advancedSectionTitleSystem", |
425 IDS_OPTIONS_ADVANCED_SECTION_TITLE_SYSTEM }, | 429 IDS_OPTIONS_ADVANCED_SECTION_TITLE_SYSTEM }, |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
595 #if defined(OS_CHROMEOS) | 599 #if defined(OS_CHROMEOS) |
596 values->SetString("easyUnlockCheckboxLabel", | 600 values->SetString("easyUnlockCheckboxLabel", |
597 l10n_util::GetStringFUTF16( | 601 l10n_util::GetStringFUTF16( |
598 IDS_OPTIONS_EASY_UNLOCK_CHECKBOX_LABEL_CHROMEOS, | 602 IDS_OPTIONS_EASY_UNLOCK_CHECKBOX_LABEL_CHROMEOS, |
599 chromeos::GetChromeDeviceType())); | 603 chromeos::GetChromeDeviceType())); |
600 | 604 |
601 values->SetBoolean( | 605 values->SetBoolean( |
602 "consumerManagementEnabled", | 606 "consumerManagementEnabled", |
603 CommandLine::ForCurrentProcess()->HasSwitch( | 607 CommandLine::ForCurrentProcess()->HasSwitch( |
604 chromeos::switches::kEnableConsumerManagement)); | 608 chromeos::switches::kEnableConsumerManagement)); |
| 609 |
| 610 RegisterTitle(values, "thirdPartyImeConfirmOverlay", |
| 611 IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_TITLE); |
605 #endif | 612 #endif |
606 } | 613 } |
607 | 614 |
608 #if defined(ENABLE_FULL_PRINTING) | 615 #if defined(ENABLE_FULL_PRINTING) |
609 void BrowserOptionsHandler::RegisterCloudPrintValues( | 616 void BrowserOptionsHandler::RegisterCloudPrintValues( |
610 base::DictionaryValue* values) { | 617 base::DictionaryValue* values) { |
611 values->SetString("cloudPrintOptionLabel", | 618 values->SetString("cloudPrintOptionLabel", |
612 l10n_util::GetStringFUTF16( | 619 l10n_util::GetStringFUTF16( |
613 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL, | 620 IDS_CLOUD_PRINT_CHROMEOS_OPTION_LABEL, |
614 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT))); | 621 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT))); |
(...skipping 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1778 ExtensionRegistry::ENABLED); | 1785 ExtensionRegistry::ENABLED); |
1779 } | 1786 } |
1780 AppendExtensionData("newTabPage", extension, &extension_controlled); | 1787 AppendExtensionData("newTabPage", extension, &extension_controlled); |
1781 | 1788 |
1782 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", | 1789 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", |
1783 extension_controlled); | 1790 extension_controlled); |
1784 #endif // defined(OS_WIN) | 1791 #endif // defined(OS_WIN) |
1785 } | 1792 } |
1786 | 1793 |
1787 } // namespace options | 1794 } // namespace options |
OLD | NEW |