chromeos: Update help URLs.

This also moves some untranslatable URL strings out of .grd
files and into code so we don't duplicate them per-language.

BUG=chromium-os:8117
TEST=trybots; also built and ran the chrome os version

Review URL: http://codereview.chromium.org/4495001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65683 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 14 insertions, 7 deletions

diff --git a/chrome/browser/ui/views/options/advanced_contents_view.cc b/chrome/browser/ui/views/options/advanced_contents_view.cc
index b8513b6..4fa3116 100644
--- a/chrome/browser/ui/views/options/advanced_contents_view.cc
+++ b/chrome/browser/ui/views/options/advanced_contents_view.cc
@@ -27,6 +27,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_prefs.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/gears_integration.h"
 #include "chrome/browser/options_util.h"
 #include "chrome/browser/prefs/pref_member.h"
@@ -48,6 +49,7 @@
 #include "chrome/browser/views/restart_message_box.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/url_constants.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/native_theme_win.h"
 #include "grit/app_resources.h"
@@ -540,9 +542,9 @@ void PrivacySection::ButtonPressed(
 
 void PrivacySection::LinkActivated(views::Link* source, int event_flags) {
   DCHECK(source == learn_more_link_);
-  browser::ShowOptionsURL(
-      profile(),
-      GURL(l10n_util::GetString(IDS_LEARN_MORE_PRIVACY_URL)));
+  GURL url = google_util::AppendGoogleLocaleParam(
+      GURL(chrome::kPrivacyLearnMoreURL));
+  browser::ShowOptionsURL(profile(), url);
 }
 
 void PrivacySection::InitControlLayout() {
diff --git a/chrome/browser/ui/views/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info_bubble_view.cc
index 90fa667..0dbd950 100644
--- a/chrome/browser/ui/views/page_info_bubble_view.cc
+++ b/chrome/browser/ui/views/page_info_bubble_view.cc
@@ -9,9 +9,11 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/certificate_viewer.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/browser/views/toolbar_view.h"
+#include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/controls/image_view.h"
@@ -205,7 +207,8 @@ void PageInfoBubbleView::ModelChanged() {
 }
 
 void PageInfoBubbleView::LinkActivated(views::Link* source, int event_flags) {
-  GURL url = GURL(l10n_util::GetStringUTF16(IDS_PAGE_INFO_HELP_CENTER));
+  GURL url = google_util::AppendGoogleLocaleParam(
+      GURL(chrome::kPageInfoHelpCenterURL));
   Browser* browser = BrowserList::GetLastActive();
   browser->OpenURL(url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
 }
diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc
index 31f45fd..f8a48a9 100644
--- a/chrome/browser/ui/views/sad_tab_view.cc
+++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -6,8 +6,10 @@
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
+#include "chrome/common/url_constants.h"
 #include "gfx/canvas.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/size.h"
@@ -110,7 +112,8 @@ void SadTabView::Layout() {
 
 void SadTabView::LinkActivated(views::Link* source, int event_flags) {
   if (tab_contents_ != NULL && source == learn_more_link_) {
-    string16 url = l10n_util::GetStringUTF16(IDS_CRASH_REASON_URL);
+    GURL help_url =
+        google_util::AppendGoogleLocaleParam(GURL(chrome::kCrashReasonURL));
     WindowOpenDisposition disposition(CURRENT_TAB);
 #if defined(OS_CHROMEOS)
     if (tab_contents_->delegate() &&
@@ -120,8 +123,7 @@ void SadTabView::LinkActivated(views::Link* source, int event_flags) {
       disposition = NEW_FOREGROUND_TAB;
     }
 #endif
-    tab_contents_->OpenURL(GURL(url), GURL(), disposition,
-        PageTransition::LINK);
+    tab_contents_->OpenURL(help_url, GURL(), disposition, PageTransition::LINK);
   }
 }