| 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 <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 { "autoclickDelayExtremelyShort", | 408 { "autoclickDelayExtremelyShort", |
| 409 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT }, | 409 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT }, |
| 410 { "autoclickDelayLong", | 410 { "autoclickDelayLong", |
| 411 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_LONG }, | 411 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_LONG }, |
| 412 { "autoclickDelayShort", | 412 { "autoclickDelayShort", |
| 413 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_SHORT }, | 413 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_SHORT }, |
| 414 { "autoclickDelayVeryLong", | 414 { "autoclickDelayVeryLong", |
| 415 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG }, | 415 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG }, |
| 416 { "autoclickDelayVeryShort", | 416 { "autoclickDelayVeryShort", |
| 417 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT }, | 417 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT }, |
| 418 { "batteryButton", IDS_OPTIONS_SETTINGS_BATTERY_DESCRIPTION}, | |
| 419 { "changePicture", IDS_OPTIONS_CHANGE_PICTURE }, | 418 { "changePicture", IDS_OPTIONS_CHANGE_PICTURE }, |
| 420 { "changePictureCaption", IDS_OPTIONS_CHANGE_PICTURE_CAPTION }, | 419 { "changePictureCaption", IDS_OPTIONS_CHANGE_PICTURE_CAPTION }, |
| 421 { "consumerManagementDescription", | 420 { "consumerManagementDescription", |
| 422 IDS_OPTIONS_CONSUMER_MANAGEMENT_DESCRIPTION }, | 421 IDS_OPTIONS_CONSUMER_MANAGEMENT_DESCRIPTION }, |
| 423 { "consumerManagementEnrollButton", | 422 { "consumerManagementEnrollButton", |
| 424 IDS_OPTIONS_CONSUMER_MANAGEMENT_ENROLL_BUTTON }, | 423 IDS_OPTIONS_CONSUMER_MANAGEMENT_ENROLL_BUTTON }, |
| 425 { "consumerManagementEnrollingButton", | 424 { "consumerManagementEnrollingButton", |
| 426 IDS_OPTIONS_CONSUMER_MANAGEMENT_ENROLLING_BUTTON }, | 425 IDS_OPTIONS_CONSUMER_MANAGEMENT_ENROLLING_BUTTON }, |
| 427 { "consumerManagementUnenrollButton", | 426 { "consumerManagementUnenrollButton", |
| 428 IDS_OPTIONS_CONSUMER_MANAGEMENT_UNENROLL_BUTTON }, | 427 IDS_OPTIONS_CONSUMER_MANAGEMENT_UNENROLL_BUTTON }, |
| (...skipping 21 matching lines...) Expand all Loading... |
| 450 IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE }, | 449 IDS_OPTIONS_DEVICE_GROUP_KEYBOARD_SETTINGS_BUTTON_TITLE }, |
| 451 { "manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE }, | 450 { "manageAccountsButtonTitle", IDS_OPTIONS_ACCOUNTS_BUTTON_TITLE }, |
| 452 { "mouseSpeed", IDS_OPTIONS_SETTINGS_MOUSE_SPEED_DESCRIPTION }, | 451 { "mouseSpeed", IDS_OPTIONS_SETTINGS_MOUSE_SPEED_DESCRIPTION }, |
| 453 { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES }, | 452 { "noPointingDevices", IDS_OPTIONS_NO_POINTING_DEVICES }, |
| 454 { "powerSettingsButton", | 453 { "powerSettingsButton", |
| 455 IDS_OPTIONS_DEVICE_GROUP_POWER_SETTINGS_BUTTON }, | 454 IDS_OPTIONS_DEVICE_GROUP_POWER_SETTINGS_BUTTON }, |
| 456 { "resolveTimezoneByGeoLocation", | 455 { "resolveTimezoneByGeoLocation", |
| 457 IDS_OPTIONS_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION }, | 456 IDS_OPTIONS_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION }, |
| 458 { "sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME }, | 457 { "sectionTitleDevice", IDS_OPTIONS_DEVICE_GROUP_NAME }, |
| 459 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL }, | 458 { "sectionTitleInternet", IDS_OPTIONS_INTERNET_OPTIONS_GROUP_LABEL }, |
| 460 { "storageButton", IDS_OPTIONS_SETTINGS_STORAGE_DESCRIPTION}, | |
| 461 { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL }, | 459 { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL }, |
| 462 { "thirdPartyImeConfirmDisable", IDS_CANCEL }, | 460 { "thirdPartyImeConfirmDisable", IDS_CANCEL }, |
| 463 { "thirdPartyImeConfirmEnable", IDS_OK }, | 461 { "thirdPartyImeConfirmEnable", IDS_OK }, |
| 464 { "thirdPartyImeConfirmMessage", | 462 { "thirdPartyImeConfirmMessage", |
| 465 IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_MESSAGE }, | 463 IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_MESSAGE }, |
| 466 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION }, | 464 { "timezone", IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION }, |
| 467 { "touchpadSpeed", IDS_OPTIONS_SETTINGS_TOUCHPAD_SPEED_DESCRIPTION }, | 465 { "touchpadSpeed", IDS_OPTIONS_SETTINGS_TOUCHPAD_SPEED_DESCRIPTION }, |
| 468 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION }, | 466 { "use24HourClock", IDS_OPTIONS_SETTINGS_USE_24HOUR_CLOCK_DESCRIPTION }, |
| 469 { "wakeOnWifiLabel", IDS_OPTIONS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION }, | 467 { "wakeOnWifiLabel", IDS_OPTIONS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION }, |
| 470 #else | 468 #else |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 658 chromeos::switches::kEnableConsumerManagement)); | 656 chromeos::switches::kEnableConsumerManagement)); |
| 659 | 657 |
| 660 RegisterTitle(values, "thirdPartyImeConfirmOverlay", | 658 RegisterTitle(values, "thirdPartyImeConfirmOverlay", |
| 661 IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_TITLE); | 659 IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_TITLE); |
| 662 #endif | 660 #endif |
| 663 | 661 |
| 664 values->SetBoolean("showSetDefault", ShouldShowSetDefaultBrowser()); | 662 values->SetBoolean("showSetDefault", ShouldShowSetDefaultBrowser()); |
| 665 | 663 |
| 666 values->SetBoolean("allowAdvancedSettings", ShouldAllowAdvancedSettings()); | 664 values->SetBoolean("allowAdvancedSettings", ShouldAllowAdvancedSettings()); |
| 667 | 665 |
| 668 values->SetBoolean("websiteSettingsManagerEnabled", | |
| 669 base::CommandLine::ForCurrentProcess()->HasSwitch( | |
| 670 switches::kEnableWebsiteSettingsManager)); | |
| 671 | |
| 672 values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu()); | 666 values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu()); |
| 673 | 667 |
| 674 #if defined(OS_CHROMEOS) | 668 #if defined(OS_CHROMEOS) |
| 675 values->SetBoolean( | 669 values->SetBoolean( |
| 676 "showWakeOnWifi", | 670 "showWakeOnWifi", |
| 677 chromeos::WakeOnWifiManager::Get()->WakeOnWifiSupported() && | 671 chromeos::WakeOnWifiManager::Get()->WakeOnWifiSupported() && |
| 678 chromeos::switches::WakeOnWifiEnabled()); | 672 chromeos::switches::WakeOnWifiEnabled()); |
| 679 const bool have_disable_time_zone_tracking_option_switch = | 673 const bool have_disable_time_zone_tracking_option_switch = |
| 680 base::CommandLine::ForCurrentProcess()->HasSwitch( | 674 base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 681 chromeos::switches::kDisableTimeZoneTrackingOption); | 675 chromeos::switches::kDisableTimeZoneTrackingOption); |
| (...skipping 1491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2173 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns, | 2167 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns, |
| 2174 const policy::PolicyMap& previous, | 2168 const policy::PolicyMap& previous, |
| 2175 const policy::PolicyMap& current) { | 2169 const policy::PolicyMap& current) { |
| 2176 std::set<std::string> different_keys; | 2170 std::set<std::string> different_keys; |
| 2177 current.GetDifferingKeys(previous, &different_keys); | 2171 current.GetDifferingKeys(previous, &different_keys); |
| 2178 if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled)) | 2172 if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled)) |
| 2179 SetupMetricsReportingCheckbox(); | 2173 SetupMetricsReportingCheckbox(); |
| 2180 } | 2174 } |
| 2181 | 2175 |
| 2182 } // namespace options | 2176 } // namespace options |
| OLD | NEW |