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

Unified Diff: chrome/browser/search_engines/template_url_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/search_engines/template_url_service.cc
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index e4610989cc79c9dbdc9c751d1591cb63dedbfb13..98afd945da5efb26f11a9921f594d40a104c116b 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -7,6 +7,7 @@
#include "base/auto_reset.h"
#include "base/command_line.h"
#include "base/environment.h"
+#include "base/guid.h"
#include "base/i18n/case_conversion.h"
#include "base/metrics/histogram.h"
#include "base/stl_util.h"
@@ -38,7 +39,6 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/env_vars.h"
#include "chrome/common/extensions/extension.h"
-#include "chrome/common/guid.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/notification_service.h"
@@ -2371,7 +2371,7 @@ void TemplateURLService::PatchMissingSyncGUIDs(
// should be persisted to disk and synced.
if (template_url->sync_guid().empty() &&
!template_url->IsExtensionKeyword()) {
- template_url->data_.sync_guid = guid::GenerateGUID();
+ template_url->data_.sync_guid = base::GenerateGUID();
if (service_.get())
service_->UpdateKeyword(template_url->data());
}
« no previous file with comments | « chrome/browser/search_engines/template_url.cc ('k') | chrome/browser/ui/webui/options2/autofill_options_handler2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698