| 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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 { "networkPredictionEnabledDescription", | 218 { "networkPredictionEnabledDescription", |
| 219 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION }, | 219 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION }, |
| 220 { "passwordsAndAutofillGroupName", | 220 { "passwordsAndAutofillGroupName", |
| 221 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME }, | 221 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME }, |
| 222 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE }, | 222 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE }, |
| 223 { "passwordGenerationEnabledDescription", | 223 { "passwordGenerationEnabledDescription", |
| 224 IDS_OPTIONS_PASSWORD_GENERATION_ENABLED_LABEL }, | 224 IDS_OPTIONS_PASSWORD_GENERATION_ENABLED_LABEL }, |
| 225 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON }, | 225 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON }, |
| 226 { "privacyContentSettingsButton", | 226 { "privacyContentSettingsButton", |
| 227 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON }, | 227 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON }, |
| 228 #if defined(OS_WIN) |
| 229 { "privacyWin8Data", IDS_WINDOWS8_PRIVACY_HANDLING_INFO }, |
| 230 #endif |
| 228 { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL }, | 231 { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL }, |
| 229 { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL }, | 232 { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL }, |
| 230 { "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL }, | 233 { "profilesDeleteSingle", IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL }, |
| 231 { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT }, | 234 { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT }, |
| 232 { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL }, | 235 { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL }, |
| 233 { "proxiesLabel", IDS_OPTIONS_PROXIES_LABEL }, | 236 { "proxiesLabel", IDS_OPTIONS_PROXIES_LABEL }, |
| 234 { "safeBrowsingEnableProtection", | 237 { "safeBrowsingEnableProtection", |
| 235 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION }, | 238 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION }, |
| 236 { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME }, | 239 { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME }, |
| 237 { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME }, | 240 { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME }, |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 #if defined(OS_CHROMEOS) | 366 #if defined(OS_CHROMEOS) |
| 364 values->SetString("username", | 367 values->SetString("username", |
| 365 chromeos::UserManager::Get()->IsUserLoggedIn() ? | 368 chromeos::UserManager::Get()->IsUserLoggedIn() ? |
| 366 chromeos::UserManager::Get()->GetLoggedInUser().email() : | 369 chromeos::UserManager::Get()->GetLoggedInUser().email() : |
| 367 std::string()); | 370 std::string()); |
| 368 #endif | 371 #endif |
| 369 | 372 |
| 370 // Pass along sync status early so it will be available during page init. | 373 // Pass along sync status early so it will be available during page init. |
| 371 values->Set("syncData", GetSyncStateDictionary().release()); | 374 values->Set("syncData", GetSyncStateDictionary().release()); |
| 372 | 375 |
| 376 #if defined(OS_WIN) |
| 377 values->SetString("privacyWin8DataLearnMoreURL", |
| 378 chrome::kPrivacyWin8DataLearnMoreURL); |
| 379 #endif |
| 373 values->SetString("privacyLearnMoreURL", chrome::kPrivacyLearnMoreURL); | 380 values->SetString("privacyLearnMoreURL", chrome::kPrivacyLearnMoreURL); |
| 374 values->SetString("sessionRestoreLearnMoreURL", | 381 values->SetString("sessionRestoreLearnMoreURL", |
| 375 chrome::kSessionRestoreLearnMoreURL); | 382 chrome::kSessionRestoreLearnMoreURL); |
| 376 | 383 |
| 377 values->SetString( | 384 values->SetString( |
| 378 "languageSectionLabel", | 385 "languageSectionLabel", |
| 379 l10n_util::GetStringFUTF16( | 386 l10n_util::GetStringFUTF16( |
| 380 IDS_OPTIONS_ADVANCED_LANGUAGE_LABEL, | 387 IDS_OPTIONS_ADVANCED_LANGUAGE_LABEL, |
| 381 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); | 388 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))); |
| 382 | 389 |
| (...skipping 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1433 } | 1440 } |
| 1434 | 1441 |
| 1435 void BrowserOptionsHandler::SetupSSLConfigSettings() { | 1442 void BrowserOptionsHandler::SetupSSLConfigSettings() { |
| 1436 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); | 1443 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); |
| 1437 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); | 1444 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); |
| 1438 web_ui()->CallJavascriptFunction( | 1445 web_ui()->CallJavascriptFunction( |
| 1439 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); | 1446 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); |
| 1440 } | 1447 } |
| 1441 | 1448 |
| 1442 } // namespace options | 1449 } // namespace options |
| OLD | NEW |