diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd index bcf0e613553a5857e813ad37859924e286766963..ad67dd89c6b7c8d52d688983353e7753fb08b05f 100644 --- a/chrome/app/resources/locale_settings.grd +++ b/chrome/app/resources/locale_settings.grd @@ -550,11 +550,6 @@ http://www.google.com/support/chrome/bin/answer.py?answer=142065&hl=[GRITLANGCODE] </message> - <!-- The URL for the "Problems installing" page for the Plugins infobar --> - <message name="IDS_LEARN_MORE_PLUGININSTALLER_URL" translateable="false"> - http://www.google.com/support/chrome/bin/answer.py?answer=95697&topic=14687 - </message> - <!-- The width and height of the bookmark manager in characters and lines --> <!-- (See above). --> <message name="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS" use_name_for_id="true"> @@ -579,11 +574,6 @@ https://tools.google.com/chrome/intl/[GRITLANGCODE]/themes/index.html </message> - <!-- The URL for the privacy dashboard. --> - <message name="IDS_PRIVACY_DASHBOARD_URL" translateable="false"> - https://www.google.com/dashboard - </message> - <!-- The URL for Google Chrome welcome page. This is used for the pre --> <!-- populated thumbnails. --> <message name="IDS_CHROME_WELCOME_URL" translateable="false"> diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 3a5d962ca1894b880ee15d56455128fa51ac75c0..bf4d3857aca93a1bfab6d84cb9eed77a77b83e3d 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -157,6 +157,9 @@ static const std::string kBrokenPageUrl = static const std::string kHashMark = "#"; +// The URL for the privacy dashboard. +static const char kPrivacyDashboardUrl[] = "https://www.google.com/dashboard"; + /////////////////////////////////////////////////////////////////////////////// namespace { @@ -1847,8 +1850,8 @@ void Browser::OpenThemeGalleryTabAndActivate() { } void Browser::OpenPrivacyDashboardTabAndActivate() { - OpenURL(GURL(l10n_util::GetStringUTF8(IDS_PRIVACY_DASHBOARD_URL)), - GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK); + OpenURL(GURL(kPrivacyDashboardUrl), GURL(), + NEW_FOREGROUND_TAB, PageTransition::LINK); window_->Activate(); } diff --git a/chrome/browser/plugin_installer.cc b/chrome/browser/plugin_installer.cc index 1b1d0c504a99c9936fd72669cc46435061db5dd5..b6ceb3cad7638b8b765717c8a83f90a1cb0688ac 100644 --- a/chrome/browser/plugin_installer.cc +++ b/chrome/browser/plugin_installer.cc @@ -14,6 +14,10 @@ #include "grit/theme_resources.h" #include "webkit/glue/plugins/default_plugin_shared.h" +// The URL for the "Problems installing" page for the Plugins infobar. +static const char kLearnMorePluginInstallerUrl[] = + "http://www.google.com/support/chrome/bin/answer.py?answer=95697&topic=14687"; + PluginInstaller::PluginInstaller(TabContents* tab_contents) : ConfirmInfoBarDelegate(tab_contents), tab_contents_(tab_contents) { @@ -73,8 +77,7 @@ string16 PluginInstaller::GetLinkText() { bool PluginInstaller::LinkClicked(WindowOpenDisposition disposition) { // Ignore the click dispostion and always open in a new top level tab. - tab_contents_->OpenURL( - GURL(l10n_util::GetStringUTF8(IDS_LEARN_MORE_PLUGININSTALLER_URL)), - GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK); + tab_contents_->OpenURL(GURL(kLearnMorePluginInstallerUrl), GURL(), + NEW_FOREGROUND_TAB, PageTransition::LINK); return false; // Do not dismiss the info bar. } diff --git a/chrome/browser/views/clear_server_data.cc b/chrome/browser/views/clear_server_data.cc index d01daf6e14c666ca115e27b0c645800e27d86840..2cd3be765471fd5b5432a6e6f5e2acd24047985a 100644 --- a/chrome/browser/views/clear_server_data.cc +++ b/chrome/browser/views/clear_server_data.cc @@ -250,9 +250,7 @@ void ClearServerDataView::LinkActivated(views::Link* source, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK); browser->window()->Show(); } else { - browser->OpenURL(GURL(l10n_util::GetStringUTF8(IDS_PRIVACY_DASHBOARD_URL)), - GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK); - browser->window()->Show(); + browser->OpenPrivacyDashboardTabAndActivate(); } }