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

Unified Diff: chrome/browser/chromeos/login/existing_user_controller.cc

Issue 10384086: Moved url_utils from chrome/browser/net to chrome/common/net. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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/gdata/gdata_operations.cc ('k') | chrome/browser/google/google_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/existing_user_controller.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index 241d778584c1136693dcf40aa9382bd2e92abe9b..1b55207f51be1c82a0c9b8c4805dd95320171151 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -32,7 +32,6 @@
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/chromeos/system/statistics_provider.h"
#include "chrome/browser/google/google_util.h"
-#include "chrome/browser/net/browser_url_util.h"
#include "chrome/browser/policy/policy_service.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/session_startup_pref.h"
@@ -41,6 +40,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/net/gaia/google_service_auth_error.h"
+#include "chrome/common/net/url_util.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "chromeos/dbus/dbus_thread_manager.h"
@@ -762,18 +762,18 @@ std::string ExistingUserController::GetGettingStartedGuideURL() const {
if (!provider->GetMachineStatistic(kMachineInfoBoard, &board))
LOG(ERROR) << "Failed to get board information";
if (!board.empty()) {
- guide_url = chrome_browser_net::AppendQueryParameter(guide_url,
+ guide_url = chrome_common_net::AppendQueryParameter(guide_url,
kGetStartedBoardParam,
board);
}
if (is_owner_login_) {
- guide_url = chrome_browser_net::AppendQueryParameter(
+ guide_url = chrome_common_net::AppendQueryParameter(
guide_url,
kGetStartedOwnerParam,
kGetStartedOwnerParamValue);
}
guide_url = google_util::AppendGoogleLocaleParam(guide_url);
- guide_url = chrome_browser_net::AppendQueryParameter(
+ guide_url = chrome_common_net::AppendQueryParameter(
guide_url,
kGetStartedInitialLocaleParam,
WizardController::GetInitialLocale());
« no previous file with comments | « chrome/browser/chromeos/gdata/gdata_operations.cc ('k') | chrome/browser/google/google_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698