summaryrefslogtreecommitdiffstats
path: root/chrome/browser/web_resource
diff options
context:
space:
mode:
authorgroby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-09 22:34:36 +0000
committergroby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-09 22:34:36 +0000
commit06305964e02af11bda4699175340ffec2f784f6b (patch)
treebb565cff1a2e9218ca85b98d953f1a1b2ab070b6 /chrome/browser/web_resource
parent3ebf7d606bfd9d3d90c34542db5a370340af63b8 (diff)
downloadchromium_src-06305964e02af11bda4699175340ffec2f784f6b.zip
chromium_src-06305964e02af11bda4699175340ffec2f784f6b.tar.gz
chromium_src-06305964e02af11bda4699175340ffec2f784f6b.tar.bz2
Moved url_utils from chrome/browser/net to chrome/common/net.
There is an upcoming CL that needs those functions from chrome/common/extensions. TBR=satorux@chromium.org, pkasting@chromium.org BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10384086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136154 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_resource')
-rw-r--r--chrome/browser/web_resource/notification_promo.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/web_resource/notification_promo.cc b/chrome/browser/web_resource/notification_promo.cc
index 0c24e8f..6f31d9b 100644
--- a/chrome/browser/web_resource/notification_promo.cc
+++ b/chrome/browser/web_resource/notification_promo.cc
@@ -12,11 +12,11 @@
#include "base/string_number_conversions.h"
#include "base/time.h"
#include "base/values.h"
-#include "chrome/browser/net/browser_url_util.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile_impl.h"
#include "chrome/browser/web_resource/promo_resource_service.h"
#include "chrome/common/chrome_version_info.h"
+#include "chrome/common/net/url_util.h"
#include "chrome/common/pref_names.h"
#include "content/public/browser/user_metrics.h"
#include "googleurl/src/gurl.h"
@@ -445,11 +445,11 @@ int NotificationPromo::CurrentPlatform() {
// static
GURL NotificationPromo::PromoServerURL() {
GURL url(promo_server_url);
- url = chrome_browser_net::AppendQueryParameter(
+ url = chrome_common_net::AppendQueryParameter(
url, "dist", ChannelString());
- url = chrome_browser_net::AppendQueryParameter(
+ url = chrome_common_net::AppendQueryParameter(
url, "osname", PlatformString());
- url = chrome_browser_net::AppendQueryParameter(
+ url = chrome_common_net::AppendQueryParameter(
url, "branding", chrome::VersionInfo().Version());
DVLOG(1) << "PromoServerURL=" << url.spec();
// Note that locale param is added by WebResourceService.