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

Unified Diff: chrome/browser/chrome_to_mobile_service.cc

Issue 10540003: Move guid generation from chrome/common/ to base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: installer Created 8 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
Index: chrome/browser/chrome_to_mobile_service.cc
diff --git a/chrome/browser/chrome_to_mobile_service.cc b/chrome/browser/chrome_to_mobile_service.cc
index 433d04f45887365451d1f8745a71f7efe79baff8..3c3935458cbdf7219b2b1e8d3de3e16eadbe29f1 100644
--- a/chrome/browser/chrome_to_mobile_service.cc
+++ b/chrome/browser/chrome_to_mobile_service.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/file_util.h"
+#include "base/guid.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/metrics/histogram.h"
@@ -24,7 +25,6 @@
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/cloud_print/cloud_print_helpers.h"
-#include "chrome/common/guid.h"
#include "chrome/common/net/gaia/gaia_constants.h"
#include "chrome/common/net/gaia/gaia_urls.h"
#include "chrome/common/net/gaia/oauth2_access_token_fetcher.h"
@@ -250,7 +250,7 @@ void ChromeToMobileService::SendToMobile(const string16& mobile_id,
data.title = web_contents->GetTitle();
data.snapshot_path = snapshot;
bool send_snapshot = !snapshot.empty();
- data.snapshot_id = send_snapshot ? guid::GenerateGUID() : std::string();
+ data.snapshot_id = send_snapshot ? base::GenerateGUID() : std::string();
data.type = send_snapshot ? DELAYED_SNAPSHOT : URL;
net::URLFetcher* submit_url = CreateRequest(data);
@@ -383,7 +383,7 @@ void ChromeToMobileService::RequestAccountInfo() {
return;
std::string url_string = StringPrintf(kAccountInfoURL,
- guid::GenerateGUID().c_str(), kChromeToMobileRequestor);
+ base::GenerateGUID().c_str(), kChromeToMobileRequestor);
GURL url(url_string);
// Account information is read from the profile's cookie. If cookies are
« no previous file with comments | « chrome/browser/autofill/personal_data_manager_unittest.cc ('k') | chrome/browser/extensions/app_notification.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698