Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1656)

Unified Diff: chrome/browser/printing/print_dialog_cloud.cc

Issue 327793005: Change google_util::AppendGoogleLocaleParam to take in the application locale (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ChromeOS fix Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/google/google_util.cc ('k') | chrome/browser/safe_browsing/safe_browsing_blocking_page.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/printing/print_dialog_cloud.cc
diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc
index e610947991f63ec65bafbcfb6c4a9c9ec031fdcc..6e335e0e08d02de03bb6f251782cf241a53fe835 100644
--- a/chrome/browser/printing/print_dialog_cloud.cc
+++ b/chrome/browser/printing/print_dialog_cloud.cc
@@ -14,6 +14,7 @@
#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"
@@ -336,7 +337,8 @@ void CloudPrintFlowHandler::RegisterMessages() {
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));
@@ -711,12 +713,13 @@ void CreateCloudPrintSigninTab(Browser* browser,
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);
}
« no previous file with comments | « chrome/browser/google/google_util.cc ('k') | chrome/browser/safe_browsing/safe_browsing_blocking_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698