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

Unified Diff: chrome/browser/google/google_util.cc

Issue 12069004: google_apis: Move AppendQueryParameter() etc. from common/net/url_util.h to net/base/url_util.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/google_apis/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/google/google_util.cc
diff --git a/chrome/browser/google/google_util.cc b/chrome/browser/google/google_util.cc
index f48856bf3047db7116ee26eb8da23d6161711341..714630308eae39808722b1c9c5edd9b57b11c3d6 100644
--- a/chrome/browser/google/google_util.cc
+++ b/chrome/browser/google/google_util.cc
@@ -16,10 +16,10 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/google/google_url_tracker.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/net/url_util.h"
#include "chrome/installer/util/google_update_settings.h"
#include "googleurl/src/gurl.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+#include "net/base/url_util.h"
#if defined(OS_MACOSX)
#include "chrome/browser/mac/keystone_glue.h"
@@ -86,7 +86,7 @@ GURL AppendGoogleLocaleParam(const GURL& url) {
std::string locale = g_browser_process->GetApplicationLocale();
if (locale == "nb")
locale = "no";
- return chrome_common_net::AppendQueryParameter(url, "hl", locale);
+ return net::AppendQueryParameter(url, "hl", locale);
}
std::string StringAppendGoogleLocaleParam(const std::string& url) {
@@ -105,8 +105,8 @@ GURL AppendGoogleTLDParam(Profile* profile, const GURL& url) {
NOTREACHED();
return url;
}
- return chrome_common_net::AppendQueryParameter(
- url, "sd", google_domain.substr(first_dot + 1));
+ return net::AppendQueryParameter(url, "sd",
+ google_domain.substr(first_dot + 1));
}
#if defined(OS_WIN)
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/google_apis/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698