diff options
Diffstat (limited to 'chrome/browser/dom_ui/advanced_options_handler.cc')
| -rw-r--r-- | chrome/browser/dom_ui/advanced_options_handler.cc | 423 |
1 files changed, 259 insertions, 164 deletions
diff --git a/chrome/browser/dom_ui/advanced_options_handler.cc b/chrome/browser/dom_ui/advanced_options_handler.cc index 6999dea..778dab6 100644 --- a/chrome/browser/dom_ui/advanced_options_handler.cc +++ b/chrome/browser/dom_ui/advanced_options_handler.cc @@ -4,35 +4,38 @@ #include "chrome/browser/dom_ui/advanced_options_handler.h" -#if defined(OS_WIN) -#include <cryptuiapi.h> -#pragma comment(lib, "cryptui.lib") -#endif - #include "app/l10n_util.h" #include "base/basictypes.h" #include "base/callback.h" +#include "base/command_line.h" +#include "base/utf_string_conversions.h" #include "base/values.h" +#include "chrome/browser/browser_process.h" +#include "chrome/browser/dom_ui/options_managed_banner_handler.h" #include "chrome/browser/download/download_manager.h" -#include "chrome/browser/pref_service.h" +#include "chrome/browser/download/download_prefs.h" +#include "chrome/browser/metrics/user_metrics.h" +#include "chrome/browser/options_util.h" +#include "chrome/browser/options_window.h" +#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" +#include "chrome/common/chrome_switches.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" -#if defined(OS_WIN) -#include "net/base/ssl_config_service_win.h" +#if !defined(OS_CHROMEOS) +#include "chrome/browser/dom_ui/advanced_options_utils.h" #endif -#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) -// The URL for Linux ssl certificate configuration help. -const char* const kLinuxCertificatesConfigUrl = - "http://code.google.com/p/chromium/wiki/LinuxCertManagement"; +#if defined(OS_WIN) +#include "chrome/browser/gears_integration.h" +#include "net/base/ssl_config_service_win.h" #endif AdvancedOptionsHandler::AdvancedOptionsHandler() { @@ -45,90 +48,126 @@ void AdvancedOptionsHandler::GetLocalizedValues( DictionaryValue* localized_strings) { DCHECK(localized_strings); - localized_strings->SetString(L"privacyLearnMoreURL", - l10n_util::GetString(IDS_LEARN_MORE_PRIVACY_URL)); - localized_strings->SetString(L"privacyLearnMoreLabel", - l10n_util::GetString(IDS_OPTIONS_LEARN_MORE_LABEL)); - localized_strings->SetString(L"downloadLocationGroupName", - l10n_util::GetString(IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME)); - localized_strings->SetString(L"downloadLocationBrowseButton", - l10n_util::GetString(IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_BUTTON)); - localized_strings->SetString(L"downloadLocationBrowseTitle", - l10n_util::GetString(IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE)); - localized_strings->SetString(L"downloadLocationBrowseWindowTitle", - l10n_util::GetString(IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_WINDOW_TITLE)); - localized_strings->SetString(L"downloadLocationAskForSaveLocation", - l10n_util::GetString(IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION)); - localized_strings->SetString(L"autoOpenFileTypesInfo", - l10n_util::GetString(IDS_OPTIONS_AUTOOPENFILETYPES_INFO)); - localized_strings->SetString(L"autoOpenFileTypesResetToDefault", - l10n_util::GetString(IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT)); - localized_strings->SetString(L"gearSettingsGroupName", - l10n_util::GetString(IDS_OPTIONS_GEARSSETTINGS_GROUP_NAME)); - localized_strings->SetString(L"gearSettingsConfigureGearsButton", - l10n_util::GetString(IDS_OPTIONS_GEARSSETTINGS_CONFIGUREGEARS_BUTTON)); - localized_strings->SetString(L"translateEnableTranslate", - l10n_util::GetString(IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE)); - localized_strings->SetString(L"certificatesLabel", - l10n_util::GetString(IDS_OPTIONS_CERTIFICATES_LABEL)); - localized_strings->SetString(L"certificatesManageButton", - l10n_util::GetString(IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON)); - localized_strings->SetString(L"proxiesLabel", - l10n_util::GetString(IDS_OPTIONS_PROXIES_LABEL)); - localized_strings->SetString(L"proxiesConfigureButton", - l10n_util::GetString(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON)); - localized_strings->SetString(L"safeBrowsingEnableProtection", - l10n_util::GetString(IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION)); - localized_strings->SetString(L"sslGroupDescription", - l10n_util::GetString(IDS_OPTIONS_SSL_GROUP_DESCRIPTION)); - localized_strings->SetString(L"sslUseSSL2", - l10n_util::GetString(IDS_OPTIONS_SSL_USESSL2)); - localized_strings->SetString(L"sslCheckRevocation", - l10n_util::GetString(IDS_OPTIONS_SSL_CHECKREVOCATION)); - localized_strings->SetString(L"sslUseSSL3", - l10n_util::GetString(IDS_OPTIONS_SSL_USESSL3)); - localized_strings->SetString(L"sslUseTLS1", - l10n_util::GetString(IDS_OPTIONS_SSL_USETLS1)); - localized_strings->SetString(L"networkDNSPrefetchEnabledDescription", - l10n_util::GetString(IDS_NETWORK_DNS_PREFETCH_ENABLED_DESCRIPTION)); - localized_strings->SetString(L"privacyContentSettingsButton", - l10n_util::GetString(IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON)); - localized_strings->SetString(L"privacyClearDataButton", - l10n_util::GetString(IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON)); - localized_strings->SetString(L"linkDoctorPref", - l10n_util::GetString(IDS_OPTIONS_LINKDOCTOR_PREF)); - localized_strings->SetString(L"suggestPref", - l10n_util::GetString(IDS_OPTIONS_SUGGEST_PREF)); - localized_strings->SetString(L"tabsToLinksPref", - l10n_util::GetString(IDS_OPTIONS_TABS_TO_LINKS_PREF)); - localized_strings->SetString(L"fontSettingsInfo", - l10n_util::GetString(IDS_OPTIONS_FONTSETTINGS_INFO)); - localized_strings->SetString(L"fontSettingsConfigureFontsOnlyButton", - l10n_util::GetString(IDS_OPTIONS_FONTSETTINGS_CONFIGUREFONTSONLY_BUTTON)); - localized_strings->SetString(L"advancedSectionTitlePrivacy", - l10n_util::GetString(IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY)); - localized_strings->SetString(L"advancedSectionTitleContent", - l10n_util::GetString(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT)); - localized_strings->SetString(L"advancedSectionTitleSecurity", - l10n_util::GetString(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY)); - localized_strings->SetString(L"advancedSectionTitleNetwork", - l10n_util::GetString(IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK)); - localized_strings->SetString(L"advancedSectionTitleTranslate", - l10n_util::GetString(IDS_OPTIONS_ADVANCED_SECTION_TITLE_TRANSLATE)); - localized_strings->SetString(L"translateEnableTranslate", - l10n_util::GetString(IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE)); - localized_strings->SetString(L"enableLogging", - l10n_util::GetString(IDS_OPTIONS_ENABLE_LOGGING)); - localized_strings->SetString(L"disableServices", - l10n_util::GetString(IDS_OPTIONS_DISABLE_SERVICES)); + localized_strings->SetString("privacyLearnMoreURL", + l10n_util::GetStringUTF16(IDS_LEARN_MORE_PRIVACY_URL)); + localized_strings->SetString("privacyLearnMoreLabel", + l10n_util::GetStringUTF16(IDS_OPTIONS_LEARN_MORE_LABEL)); + localized_strings->SetString("downloadLocationGroupName", + l10n_util::GetStringUTF16(IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME)); + localized_strings->SetString("downloadLocationBrowseButton", + l10n_util::GetStringUTF16(IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_BUTTON)); + localized_strings->SetString("downloadLocationBrowseTitle", + l10n_util::GetStringUTF16(IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE)); + localized_strings->SetString("downloadLocationBrowseWindowTitle", + l10n_util::GetStringUTF16( + IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_WINDOW_TITLE)); + localized_strings->SetString("downloadLocationAskForSaveLocation", + l10n_util::GetStringUTF16( + IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION)); + localized_strings->SetString("autoOpenFileTypesInfo", + l10n_util::GetStringUTF16(IDS_OPTIONS_AUTOOPENFILETYPES_INFO)); + localized_strings->SetString("autoOpenFileTypesResetToDefault", + l10n_util::GetStringUTF16(IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT)); + localized_strings->SetString("gearSettingsGroupName", + l10n_util::GetStringUTF16(IDS_OPTIONS_GEARSSETTINGS_GROUP_NAME)); + localized_strings->SetString("gearSettingsConfigureGearsButton", + l10n_util::GetStringUTF16( + IDS_OPTIONS_GEARSSETTINGS_CONFIGUREGEARS_BUTTON)); + localized_strings->SetString("translateEnableTranslate", + l10n_util::GetStringUTF16(IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE)); + localized_strings->SetString("certificatesLabel", + l10n_util::GetStringUTF16(IDS_OPTIONS_CERTIFICATES_LABEL)); + localized_strings->SetString("certificatesManageButton", + l10n_util::GetStringUTF16(IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON)); + localized_strings->SetString("proxiesLabel", + l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_LABEL)); + localized_strings->SetString("proxiesConfigureButton", + l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON)); + localized_strings->SetString("safeBrowsingEnableProtection", + l10n_util::GetStringUTF16(IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION)); + localized_strings->SetString("sslGroupDescription", + l10n_util::GetStringUTF16(IDS_OPTIONS_SSL_GROUP_DESCRIPTION)); + localized_strings->SetString("sslUseSSL2", + l10n_util::GetStringUTF16(IDS_OPTIONS_SSL_USESSL2)); + localized_strings->SetString("sslCheckRevocation", + l10n_util::GetStringUTF16(IDS_OPTIONS_SSL_CHECKREVOCATION)); + localized_strings->SetString("sslUseSSL3", + l10n_util::GetStringUTF16(IDS_OPTIONS_SSL_USESSL3)); + localized_strings->SetString("sslUseTLS1", + l10n_util::GetStringUTF16(IDS_OPTIONS_SSL_USETLS1)); + localized_strings->SetString("networkDNSPrefetchEnabledDescription", + l10n_util::GetStringUTF16(IDS_NETWORK_DNS_PREFETCH_ENABLED_DESCRIPTION)); + localized_strings->SetString("privacyContentSettingsButton", + l10n_util::GetStringUTF16(IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON)); + localized_strings->SetString("privacyClearDataButton", + l10n_util::GetStringUTF16(IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON)); + localized_strings->SetString("linkDoctorPref", + l10n_util::GetStringUTF16(IDS_OPTIONS_LINKDOCTOR_PREF)); + localized_strings->SetString("suggestPref", + l10n_util::GetStringUTF16(IDS_OPTIONS_SUGGEST_PREF)); + localized_strings->SetString("tabsToLinksPref", + l10n_util::GetStringUTF16(IDS_OPTIONS_TABS_TO_LINKS_PREF)); + localized_strings->SetString("fontSettingsInfo", + l10n_util::GetStringUTF16(IDS_OPTIONS_FONTSETTINGS_INFO)); + localized_strings->SetString("fontSettingsConfigureFontsOnlyButton", + l10n_util::GetStringUTF16( + IDS_OPTIONS_FONTSETTINGS_CONFIGUREFONTSONLY_BUTTON)); + localized_strings->SetString("advancedSectionTitlePrivacy", + l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY)); + localized_strings->SetString("advancedSectionTitleContent", + l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT)); + localized_strings->SetString("advancedSectionTitleSecurity", + l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY)); + localized_strings->SetString("advancedSectionTitleNetwork", + l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK)); + localized_strings->SetString("advancedSectionTitleTranslate", + l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_SECTION_TITLE_TRANSLATE)); + localized_strings->SetString("translateEnableTranslate", + l10n_util::GetStringUTF16(IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE)); + // Add ChromeApps preferences if background mode is runtime-enabled. + bool background_mode_enabled = CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableBackgroundMode); + localized_strings->SetString("enable-background-mode", + background_mode_enabled ? "true" : "false"); + localized_strings->SetString("advancedSectionTitleChromeApps", + l10n_util::GetStringUTF16( + IDS_OPTIONS_ADVANCED_SECTION_TITLE_CHROME_APPS)); + localized_strings->SetString("chromeAppsEnableBackgroundMode", + l10n_util::GetStringUTF16( + IDS_OPTIONS_CHROME_APPS_ENABLE_BACKGROUND_MODE)); + localized_strings->SetString("chromeAppsLearnMoreBackgroundModeLabel", + l10n_util::GetStringUTF16(IDS_OPTIONS_LEARN_MORE_LABEL)); + localized_strings->SetString("chromeAppsLearnMoreBackgroundModeURL", + l10n_util::GetStringUTF16(IDS_LEARN_MORE_BACKGROUND_MODE_URL)); + localized_strings->SetString("enableLogging", + l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_LOGGING)); + localized_strings->SetString("disableServices", + l10n_util::GetStringUTF16(IDS_OPTIONS_DISABLE_SERVICES)); + localized_strings->SetString("optionsReset", + l10n_util::GetStringUTF16(IDS_OPTIONS_RESET)); + localized_strings->SetString("optionsResetMessage", + l10n_util::GetStringUTF16(IDS_OPTIONS_RESET_MESSAGE)); + localized_strings->SetString("optionsResetOkLabel", + l10n_util::GetStringUTF16(IDS_OPTIONS_RESET_OKLABEL)); + localized_strings->SetString("optionsResetCancelLabel", + l10n_util::GetStringUTF16(IDS_OPTIONS_RESET_CANCELLABEL)); + localized_strings->SetString("optionsRestartRequired", + l10n_util::GetStringUTF16(IDS_OPTIONS_RESTART_REQUIRED)); } void AdvancedOptionsHandler::Initialize() { + DCHECK(dom_ui_); + SetupMetricsReportingCheckbox(false); SetupDownloadLocationPath(); SetupAutoOpenFileTypesDisabledAttribute(); + SetupProxySettingsSection(); #if defined(OS_WIN) SetupSSLConfigSettings(); #endif + banner_handler_.reset( + new OptionsManagedBannerHandler(dom_ui_, + ASCIIToUTF16("AdvancedOptions"), + OPTIONS_PAGE_ADVANCED)); } DOMMessageHandler* AdvancedOptionsHandler::Attach(DOMUI* dom_ui) { @@ -138,11 +177,14 @@ DOMMessageHandler* AdvancedOptionsHandler::Attach(DOMUI* dom_ui) { // Register for preferences that we need to observe manually. These have // special behaviors that aren't handled by the standard prefs UI. DCHECK(dom_ui_); - PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs(); + PrefService* prefs = dom_ui_->GetProfile()->GetPrefs(); + enable_metrics_recording_.Init(prefs::kMetricsReportingEnabled, + g_browser_process->local_state(), this); default_download_location_.Init(prefs::kDownloadDefaultDirectory, - pref_service, this); - auto_open_files_.Init(prefs::kDownloadExtensionsToOpen, - pref_service, this); + prefs, this); + auto_open_files_.Init(prefs::kDownloadExtensionsToOpen, prefs, this); + proxy_prefs_.reset( + PrefSetObserver::CreateProxyPrefSetObserver(prefs, this)); // Return result from the superclass. return handler; @@ -157,21 +199,34 @@ void AdvancedOptionsHandler::RegisterMessages() { dom_ui_->RegisterMessageCallback("autoOpenFileTypesAction", NewCallback(this, &AdvancedOptionsHandler::HandleAutoOpenButton)); + dom_ui_->RegisterMessageCallback("resetToDefaults", + NewCallback(this, + &AdvancedOptionsHandler::HandleResetToDefaults)); + dom_ui_->RegisterMessageCallback("metricsReportingCheckboxAction", + NewCallback(this, + &AdvancedOptionsHandler::HandleMetricsReportingCheckbox)); +#if !defined(USE_NSS) dom_ui_->RegisterMessageCallback("showManageSSLCertificates", NewCallback(this, &AdvancedOptionsHandler::ShowManageSSLCertificates)); +#endif +#if !defined(OS_CHROMEOS) dom_ui_->RegisterMessageCallback("showNetworkProxySettings", NewCallback(this, &AdvancedOptionsHandler::ShowNetworkProxySettings)); +#endif #if defined(OS_WIN) // Setup Windows specific callbacks. dom_ui_->RegisterMessageCallback("checkRevocationCheckboxAction", - NewCallback(this, - &AdvancedOptionsHandler::HandleCheckRevocationCheckbox)); + NewCallback(this, + &AdvancedOptionsHandler::HandleCheckRevocationCheckbox)); dom_ui_->RegisterMessageCallback("useSSL2CheckboxAction", - NewCallback(this, - &AdvancedOptionsHandler::HandleUseSSL2Checkbox)); + NewCallback(this, + &AdvancedOptionsHandler::HandleUseSSL2Checkbox)); + dom_ui_->RegisterMessageCallback("showGearsSettings", + NewCallback(this, + &AdvancedOptionsHandler::HandleShowGearsSettings)); #endif } @@ -179,16 +234,19 @@ void AdvancedOptionsHandler::Observe(NotificationType type, const NotificationSource& source, const NotificationDetails& details) { if (type == NotificationType::PREF_CHANGED) { - std::wstring* pref_name = Details<std::wstring>(details).ptr(); + std::string* pref_name = Details<std::string>(details).ptr(); if (*pref_name == prefs::kDownloadDefaultDirectory) { SetupDownloadLocationPath(); } else if (*pref_name == prefs::kDownloadExtensionsToOpen) { SetupAutoOpenFileTypesDisabledAttribute(); + } else if (proxy_prefs_->IsObserved(*pref_name)) { + SetupProxySettingsSection(); } } } -void AdvancedOptionsHandler::HandleSelectDownloadLocation(const Value* value) { +void AdvancedOptionsHandler::HandleSelectDownloadLocation( + const ListValue* args) { PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs(); select_folder_dialog_ = SelectFileDialog::Create(this); select_folder_dialog_->SelectFile( @@ -201,75 +259,134 @@ void AdvancedOptionsHandler::HandleSelectDownloadLocation(const Value* value) { void AdvancedOptionsHandler::FileSelected(const FilePath& path, int index, void* params) { + UserMetricsRecordAction(UserMetricsAction("Options_SetDownloadDirectory")); default_download_location_.SetValue(path); SetupDownloadLocationPath(); } -void AdvancedOptionsHandler::HandleAutoOpenButton(const Value* value) { - DCHECK(dom_ui_); +void AdvancedOptionsHandler::HandleAutoOpenButton(const ListValue* args) { + UserMetricsRecordAction(UserMetricsAction("Options_ResetAutoOpenFiles")); DownloadManager* manager = dom_ui_->GetProfile()->GetDownloadManager(); - if (manager) manager->ResetAutoOpenFiles(); + if (manager) + manager->download_prefs()->ResetAutoOpen(); +} + +void AdvancedOptionsHandler::HandleResetToDefaults(const ListValue* args) { + OptionsUtil::ResetToDefaults(dom_ui_->GetProfile()); +} + +void AdvancedOptionsHandler::HandleMetricsReportingCheckbox( + const ListValue* args) { +#if defined(GOOGLE_CHROME_BUILD) + std::string checked_str = WideToUTF8(ExtractStringValue(args)); + bool enabled = (checked_str == "true"); + UserMetricsRecordAction( + enabled ? + UserMetricsAction("Options_MetricsReportingCheckbox_Enable") : + UserMetricsAction("Options_MetricsReportingCheckbox_Disable")); + bool is_enabled = OptionsUtil::ResolveMetricsReportingEnabled(enabled); + enable_metrics_recording_.SetValue(is_enabled); + + bool user_changed = (enabled == is_enabled); + SetupMetricsReportingCheckbox(user_changed); +#endif } #if defined(OS_WIN) -void AdvancedOptionsHandler::HandleCheckRevocationCheckbox(const Value* value) { - if (!value || !value->IsType(Value::TYPE_LIST)) { - LOG(WARNING) << "checkRevocationCheckboxAction called with missing or " << - "invalid value"; - return; - } - const ListValue* list = static_cast<const ListValue*>(value); - if (list->GetSize() < 1) { - LOG(WARNING) << "checkRevocationCheckboxAction called with too few " << - "arguments"; - return; - } - std::string checked_str; - if (list->GetString(0, &checked_str)) { - net::SSLConfigServiceWin::SetRevCheckingEnabled(checked_str == "true"); - } +void AdvancedOptionsHandler::HandleCheckRevocationCheckbox( + const ListValue* args) { + std::string checked_str = WideToUTF8(ExtractStringValue(args)); + std::string metric = + (checked_str == "true" ? "Options_CheckCertRevocation_Enable" + : "Options_CheckCertRevocation_Disable"); + UserMetricsRecordAction(UserMetricsAction(metric.c_str())); + net::SSLConfigServiceWin::SetRevCheckingEnabled(checked_str == "true"); } -void AdvancedOptionsHandler::HandleUseSSL2Checkbox(const Value* value) { - if (!value || !value->IsType(Value::TYPE_LIST)) { - LOG(WARNING) << "useSSL2CheckboxAction called with missing or " << - "invalid value"; - return; - } - const ListValue* list = static_cast<const ListValue*>(value); - if (list->GetSize() < 1) { - LOG(WARNING) << "useSSL2CheckboxAction called with too few " << - "arguments"; - return; - } - std::string checked_str; - if (list->GetString(0, &checked_str)) { - net::SSLConfigServiceWin::SetSSL2Enabled(checked_str == "true"); - } +void AdvancedOptionsHandler::HandleUseSSL2Checkbox(const ListValue* args) { + std::string checked_str = WideToUTF8(ExtractStringValue(args)); + std::string metric = + (checked_str == "true" ? "Options_SSL2_Enable" + : "Options_SSL2_Disable"); + UserMetricsRecordAction(UserMetricsAction(metric.c_str())); + net::SSLConfigServiceWin::SetSSL2Enabled(checked_str == "true"); +} + +void AdvancedOptionsHandler::HandleShowGearsSettings(const ListValue* args) { + UserMetricsRecordAction(UserMetricsAction("Options_GearsSettings")); + GearsSettingsPressed( + dom_ui_->tab_contents()->view()->GetTopLevelNativeWindow()); +} +#endif + +#if !defined(OS_CHROMEOS) +void AdvancedOptionsHandler::ShowNetworkProxySettings(const ListValue* args) { + UserMetricsRecordAction(UserMetricsAction("Options_ShowProxySettings")); + AdvancedOptionsUtilities::ShowNetworkProxySettings(dom_ui_->tab_contents()); } #endif +#if !defined(USE_NSS) +void AdvancedOptionsHandler::ShowManageSSLCertificates(const ListValue* args) { + UserMetricsRecordAction(UserMetricsAction("Options_ManageSSLCertificates")); + AdvancedOptionsUtilities::ShowManageSSLCertificates(dom_ui_->tab_contents()); +} +#endif + +void AdvancedOptionsHandler::SetupMetricsReportingCheckbox(bool user_changed) { +#if defined(GOOGLE_CHROME_BUILD) + FundamentalValue checked(enable_metrics_recording_.GetValue()); + FundamentalValue disabled(enable_metrics_recording_.IsManaged()); + FundamentalValue user_has_changed(user_changed); + dom_ui_->CallJavascriptFunction( + L"options.AdvancedOptions.SetMetricsReportingCheckboxState", checked, + disabled, user_has_changed); +#endif +} + void AdvancedOptionsHandler::SetupDownloadLocationPath() { - DCHECK(dom_ui_); StringValue value(default_download_location_.GetValue().value()); dom_ui_->CallJavascriptFunction( - L"advancedOptionsSetDownloadLocationPath", value); + L"options.AdvancedOptions.SetDownloadLocationPath", value); } void AdvancedOptionsHandler::SetupAutoOpenFileTypesDisabledAttribute() { // Set the enabled state for the AutoOpenFileTypesResetToDefault button. // We enable the button if the user has any auto-open file types registered. - DCHECK(dom_ui_); DownloadManager* manager = dom_ui_->GetProfile()->GetDownloadManager(); - bool disabled = !(manager && manager->HasAutoOpenFileTypesRegistered()); + bool disabled = !(manager && manager->download_prefs()->IsAutoOpenUsed()); FundamentalValue value(disabled); dom_ui_->CallJavascriptFunction( - L"advancedOptionsSetAutoOpenFileTypesDisabledAttribute", value); + L"options.AdvancedOptions.SetAutoOpenFileTypesDisabledAttribute", value); +} + +void AdvancedOptionsHandler::SetupProxySettingsSection() { + // Disable the button if proxy settings are managed by a sysadmin or + // overridden by an extension. + PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs(); + const PrefService::Preference* proxy_server = + pref_service->FindPreference(prefs::kProxyServer); + DCHECK(proxy_server); + + FundamentalValue disabled(proxy_prefs_->IsManaged() || + proxy_server->IsExtensionControlled()); + + // Get the appropriate info string to describe the button. + string16 label_str; + if (proxy_server->IsExtensionControlled()) { + label_str = l10n_util::GetStringUTF16(IDS_OPTIONS_EXTENSION_PROXIES_LABEL); + } else { + label_str = l10n_util::GetStringFUTF16(IDS_OPTIONS_SYSTEM_PROXIES_LABEL, + l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); + } + StringValue label(label_str); + + dom_ui_->CallJavascriptFunction( + L"options.AdvancedOptions.SetupProxySettingsSection", disabled, label); } #if defined(OS_WIN) void AdvancedOptionsHandler::SetupSSLConfigSettings() { - DCHECK(dom_ui_); bool checkRevocationSetting = false; bool useSSLSetting = false; @@ -280,32 +397,10 @@ void AdvancedOptionsHandler::SetupSSLConfigSettings() { } FundamentalValue checkRevocationValue(checkRevocationSetting); dom_ui_->CallJavascriptFunction( - L"advancedOptionsSetCheckRevocationCheckboxState", checkRevocationValue); + L"options.AdvancedOptions.SetCheckRevocationCheckboxState", + checkRevocationValue); FundamentalValue useSSLValue(useSSLSetting); dom_ui_->CallJavascriptFunction( - L"advancedOptionsSetUseSSL2CheckboxStatechecked", useSSLValue); + L"options.AdvancedOptions.SetUseSSL2CheckboxStatechecked", useSSLValue); } #endif - -void AdvancedOptionsHandler::ShowNetworkProxySettings(const Value* value) { -#if defined(OS_MACOSX) - AdvancedOptionsUtilities::ShowNetworkProxySettings(); -#endif -} - -void AdvancedOptionsHandler::ShowManageSSLCertificates(const Value* value) { -#if defined(OS_MACOSX) - AdvancedOptionsUtilities::ShowManageSSLCertificates(); -#elif defined(OS_WIN) - DCHECK(dom_ui_); - CRYPTUI_CERT_MGR_STRUCT cert_mgr = { 0 }; - cert_mgr.dwSize = sizeof(CRYPTUI_CERT_MGR_STRUCT); - cert_mgr.hwndParent = - dom_ui_->tab_contents()->view()->GetTopLevelNativeWindow(); - ::CryptUIDlgCertMgr(&cert_mgr); -#elif defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) - DCHECK(dom_ui_); - dom_ui_->tab_contents()->OpenURL(GURL(kLinuxCertificatesConfigUrl), GURL(), - NEW_WINDOW, PageTransition::LINK); -#endif -} |