diff options
Diffstat (limited to 'chrome/browser/ui/webui/options')
6 files changed, 12 insertions, 19 deletions
diff --git a/chrome/browser/ui/webui/options/advanced_options_handler.cc b/chrome/browser/ui/webui/options/advanced_options_handler.cc index f68e028..48be3fa 100644 --- a/chrome/browser/ui/webui/options/advanced_options_handler.cc +++ b/chrome/browser/ui/webui/options/advanced_options_handler.cc @@ -15,7 +15,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_page_zoom.h" #include "chrome/browser/download/download_prefs.h" -#include "chrome/browser/google/google_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h" @@ -183,13 +182,11 @@ void AdvancedOptionsHandler::GetLocalizedValues( IDS_OPTIONS_ADVANCED_TAB_LABEL); localized_strings->SetString("privacyLearnMoreURL", - google_util::AppendGoogleLocaleParam( - GURL(chrome::kPrivacyLearnMoreURL)).spec()); + chrome::kPrivacyLearnMoreURL); #if defined(OS_CHROMEOS) localized_strings->SetString("cloudPrintLearnMoreURL", - google_util::AppendGoogleLocaleParam( - GURL(chrome::kCloudPrintLearnMoreURL)).spec()); + chrome::kCloudPrintLearnMoreURL); #endif } diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc index f5f7037..f16726c 100644 --- a/chrome/browser/ui/webui/options/autofill_options_handler.cc +++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -22,6 +22,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/web_ui_util.h" #include "chrome/common/guid.h" +#include "chrome/common/url_constants.h" #include "content/public/browser/web_ui.h" #include "grit/generated_resources.h" #include "grit/webkit_resources.h" @@ -293,6 +294,7 @@ void AutofillOptionsHandler::GetLocalizedValues( RegisterTitle(localized_strings, "autofillOptionsPage", IDS_AUTOFILL_OPTIONS_TITLE); + localized_strings->SetString("helpUrl", chrome::kAutofillHelpURL); SetAddressOverlayStrings(localized_strings); SetCreditCardOverlayStrings(localized_strings); } diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index 3e08d34..dfebc3c 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -96,7 +96,7 @@ void BrowserOptionsHandler::GetLocalizedValues( IDS_OPTIONS_GENERAL_TAB_LABEL); localized_strings->SetString("instantLearnMoreLink", - ASCIIToUTF16(browser::InstantLearnMoreURL().spec())); + ASCIIToUTF16(chrome::kInstantLearnMoreURL)); localized_strings->SetString("defaultBrowserUnknown", l10n_util::GetStringFUTF16(IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc index 7949a63..b88302b 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.cc +++ b/chrome/browser/ui/webui/options/core_options_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,7 +13,6 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/google/google_util.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" @@ -88,8 +87,7 @@ void CoreOptionsHandler::GetStaticLocalizedValues( l10n_util::GetStringFUTF16(IDS_OPTIONS_SEARCH_PAGE_HELP_TITLE, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); localized_strings->SetString("searchPageHelpURL", - google_util::AppendGoogleLocaleParam( - GURL(chrome::kChromeHelpURL)).spec()); + chrome::kSettingsSearchHelpURL); // Common localized_strings->SetString("ok", diff --git a/chrome/browser/ui/webui/options/password_manager_handler.cc b/chrome/browser/ui/webui/options/password_manager_handler.cc index 9ccdde8..f1bbc90 100644 --- a/chrome/browser/ui/webui/options/password_manager_handler.cc +++ b/chrome/browser/ui/webui/options/password_manager_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,6 @@ #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/google/google_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" @@ -72,8 +71,7 @@ void PasswordManagerHandler::GetLocalizedValues( IDS_PASSWORDS_EXCEPTIONS_WINDOW_TITLE); localized_strings->SetString("passwordManagerLearnMoreURL", - google_util::AppendGoogleLocaleParam( - GURL(chrome::kPasswordManagerLearnMoreURL)).spec()); + chrome::kPasswordManagerLearnMoreURL); } void PasswordManagerHandler::Initialize() { diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc index 9442a23..edad603 100644 --- a/chrome/browser/ui/webui/options/personal_options_handler.cc +++ b/chrome/browser/ui/webui/options/personal_options_handler.cc @@ -17,7 +17,6 @@ #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/google/google_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_info_util.h" @@ -88,8 +87,7 @@ void PersonalOptionsHandler::GetLocalizedValues( l10n_util::GetStringUTF16(IDS_SYNC_OPTIONS_GROUP_NAME)); localized_strings->SetString("customizeSync", l10n_util::GetStringUTF16(IDS_SYNC_CUSTOMIZE_BUTTON_LABEL)); - localized_strings->SetString("syncLearnMoreURL", - google_util::StringAppendGoogleLocaleParam(chrome::kSyncLearnMoreURL)); + localized_strings->SetString("syncLearnMoreURL", chrome::kSyncLearnMoreURL); localized_strings->SetString("profiles", l10n_util::GetStringUTF16(IDS_PROFILES_OPTIONS_GROUP_NAME)); |