Moved the various Google Accounts URLs out of gaia_login.html and into sync_s...

chrome/browser/sync/sync_setup_wizard.cc

 // Copyright (c) 2006-2008 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.
 
 #include "chrome/browser/sync/sync_setup_wizard.h"
 
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
 #include "base/singleton.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/google_util.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
+#include "googleurl/src/gurl.h"
 #include "grit/app_resources.h"
 #include "grit/browser_resources.h"
 
 class SyncResourcesSource : public ChromeURLDataManager::DataSource {
  public:
   SyncResourcesSource()
       : DataSource(chrome::kSyncResourcesHost, MessageLoop::current()) {
   }
 
   virtual void StartDataRequest(const std::string& path, int request_id);
 
   virtual std::string GetMimeType(const std::string& path) const {
     if (path == chrome::kSyncThrobberPath)
       return "image/png";
     else
       return "text/html";
   }
 
+  static const char* kInvalidPasswordHelpUrl;
+  static const char* kCanNotAccessAccountUrl;
+  static const char* kCreateNewAccountUrl;
+
  private:
   virtual ~SyncResourcesSource() {}
 
+  // Takes a string containing an URL and returns an URL containing a CGI
+  // parameter of the form "&hl=xy" where 'xy' is the language code of the
+  // current locale.
+  std::string GetLocalizedUrl(const std::string& url) const;
+
   DISALLOW_COPY_AND_ASSIGN(SyncResourcesSource);
 };
 
+const char* SyncResourcesSource::kInvalidPasswordHelpUrl =
+  "http://www.google.com/support/accounts/bin/answer.py?ctx=ch&answer=27444";
+const char* SyncResourcesSource::kCanNotAccessAccountUrl =
+  "http://www.google.com/support/accounts/bin/answer.py?answer=48598";
+const char* SyncResourcesSource::kCreateNewAccountUrl =
+  "https://www.google.com/accounts/NewAccount?service=chromiumsync";
+
 void SyncResourcesSource::StartDataRequest(const std::string& path_raw,
                                            int request_id) {
   scoped_refptr<RefCountedBytes> html_bytes(new RefCountedBytes);
   if (path_raw == chrome::kSyncThrobberPath) {
     scoped_refptr<RefCountedMemory> throbber(
         ResourceBundle::GetSharedInstance().LoadImageResourceBytes(
             IDR_THROBBER));
     SendResponse(request_id, throbber);
     return;
   }
 
   std::string response;
   if (path_raw == chrome::kSyncGaiaLoginPath) {
     DictionaryValue localized_strings;
+
+    // Start by setting the per-locale URLs we show on the setup wizard.
+    localized_strings.SetString(L"invalidpasswordhelpurl",
+        GetLocalizedUrl(kInvalidPasswordHelpUrl));
+    localized_strings.SetString(L"cannotaccessaccounturl",
+        GetLocalizedUrl(kCanNotAccessAccountUrl));
+    localized_strings.SetString(L"createnewaccounturl",
+        GetLocalizedUrl(kCreateNewAccountUrl));
+
     localized_strings.SetString(L"settingupsync",
         l10n_util::GetString(IDS_SYNC_LOGIN_SETTING_UP_SYNC));
     localized_strings.SetString(L"introduction",
         l10n_util::GetString(IDS_SYNC_LOGIN_INTRODUCTION));
     localized_strings.SetString(L"signinprefix",
         l10n_util::GetString(IDS_SYNC_LOGIN_SIGNIN_PREFIX));
     localized_strings.SetString(L"signinsuffix",
         l10n_util::GetString(IDS_SYNC_LOGIN_SIGNIN_SUFFIX));
     localized_strings.SetString(L"cannotbeblank",
         l10n_util::GetString(IDS_SYNC_CANNOT_BE_BLANK));
@@ skipping 65 matching lines @@
     static const base::StringPiece html(ResourceBundle::GetSharedInstance()
         .GetRawDataResource(IDR_SYNC_SETUP_FLOW_HTML));
     response = html.as_string();
   }
   // Send the response.
   html_bytes->data.resize(response.size());
   std::copy(response.begin(), response.end(), html_bytes->data.begin());
   SendResponse(request_id, html_bytes);
 }
 
+std::string SyncResourcesSource::GetLocalizedUrl(
+    const std::string& url) const {
+  GURL original_url(url);
+  DCHECK(original_url.is_valid());
+  GURL localized_url = google_util::AppendGoogleLocaleParam(original_url);
+  return localized_url.spec();
+}
+
 SyncSetupWizard::SyncSetupWizard(ProfileSyncService* service)
     : service_(service),
       flow_container_(new SyncSetupFlowContainer()) {
   // Add our network layer data source for 'cloudy' URLs.
   SyncResourcesSource* sync_source = new SyncResourcesSource();
   bool posted = ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
       NewRunnableMethod(Singleton<ChromeURLDataManager>::get(),
                         &ChromeURLDataManager::AddDataSource,
                         sync_source));
@@ skipping 43 matching lines @@
 }
 
 // static
 SyncSetupWizard::State SyncSetupWizard::GetEndStateForDiscreteRun(
     State start_state) {
   State result = start_state == GAIA_LOGIN ? GAIA_SUCCESS : DONE;
   DCHECK_NE(DONE, result) <<
       "Invalid start state for discrete run: " << start_state;
   return result;
 }