Change google_util::AppendGoogleLocaleParam to take in the application locale

chrome/browser/printing/print_dialog_cloud.cc

 // 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.
 
 #include "chrome/browser/printing/print_dialog_cloud.h"
 
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/printing/print_dialog_cloud_internal.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/print_messages.h"
@@ skipping 302 matching lines @@
                  base::Unretained(this)));
 
   // Register for appropriate notifications, and re-direct the URL
   // to the real server URL, now that we've gotten an HTML dialog
   // going.
   NavigationController* controller =
       &web_ui()->GetWebContents()->GetController();
   NavigationEntry* pending_entry = controller->GetPendingEntry();
   if (pending_entry) {
     pending_entry->SetURL(google_util::AppendGoogleLocaleParam(
-        cloud_devices::GetCloudPrintRelativeURL("client/dialog.html")));
+        cloud_devices::GetCloudPrintRelativeURL("client/dialog.html"),
+        g_browser_process->GetApplicationLocale()));
   }
   registrar_.Add(this, content::NOTIFICATION_LOAD_STOP,
                  content::Source<NavigationController>(controller));
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                  content::Source<NavigationController>(controller));
 }
 
 void CloudPrintFlowHandler::Observe(
     int type,
     const content::NotificationSource& source,
@@ skipping 354 matching lines @@
                  browser_context, modal_parent, path_to_file, print_job_title,
                  print_ticket, file_type));
 }
 
 void CreateCloudPrintSigninTab(Browser* browser,
                                bool add_account,
                                const base::Closure& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   GURL url = add_account ? cloud_devices::GetCloudPrintAddAccountURL()
                          : cloud_devices::GetCloudPrintSigninURL();
-  content::WebContents* web_contents = browser->OpenURL(
-      content::OpenURLParams(google_util::AppendGoogleLocaleParam(url),
-                             content::Referrer(),
-                             NEW_FOREGROUND_TAB,
-                             content::PAGE_TRANSITION_AUTO_BOOKMARK,
-                             false));
+  content::WebContents* web_contents = browser->OpenURL(content::OpenURLParams(
+      google_util::AppendGoogleLocaleParam(
+          url, g_browser_process->GetApplicationLocale()),
+      content::Referrer(),
+      NEW_FOREGROUND_TAB,
+      content::PAGE_TRANSITION_AUTO_BOOKMARK,
+      false));
   new SignInObserver(web_contents, cloud_devices::GetCloudPrintURL(), callback);
 }
 
 void CreatePrintDialogForBytes(content::BrowserContext* browser_context,
                                gfx::NativeWindow modal_parent,
                                const base::RefCountedMemory* data,
                                const base::string16& print_job_title,
                                const base::string16& print_ticket,
                                const std::string& file_type) {
   internal_cloud_print_helpers::CreateDialogImpl(browser_context, modal_parent,
@@ skipping 29 matching lines @@
 
       print_dialog_cloud::CreatePrintDialogForFile(profile, NULL,
           cloud_print_file, print_job_title, print_job_print_ticket, file_type);
       return true;
     }
   }
   return false;
 }
 
 }  // namespace print_dialog_cloud