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

Unified Diff: chrome/browser/policy/cloud_policy_controller.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/policy/cloud_policy_controller.cc
diff --git a/chrome/browser/policy/cloud_policy_controller.cc b/chrome/browser/policy/cloud_policy_controller.cc
index 83bde4a58139a36844bf56602416be948bc1d6b1..4eb9a7f9e35f2c798f5bf35ea3a13fa45192ed61 100644
--- a/chrome/browser/policy/cloud_policy_controller.cc
+++ b/chrome/browser/policy/cloud_policy_controller.cc
@@ -8,6 +8,7 @@
#include <string>
#include "base/bind.h"
+#include "base/guid.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
#include "base/rand_util.h"
@@ -20,7 +21,6 @@
#include "chrome/browser/policy/device_token_fetcher.h"
#include "chrome/browser/policy/enterprise_metrics.h"
#include "chrome/browser/policy/policy_notifier.h"
-#include "chrome/common/guid.h"
namespace policy {
@@ -319,7 +319,7 @@ void CloudPolicyController::FetchToken() {
if (CanBeInManagedDomain(data_store_->user_name())) {
// Generate a new random device id. (It'll only be kept if registration
// succeeds.)
- data_store_->set_device_id(guid::GenerateGUID());
+ data_store_->set_device_id(base::GenerateGUID());
token_fetcher_->FetchToken();
} else {
SetState(STATE_TOKEN_UNMANAGED);
« no previous file with comments | « chrome/browser/policy/cloud_policy_client.cc ('k') | chrome/browser/predictors/autocomplete_action_predictor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698