chrome/browser/search_engines/template_url.cc - Issue 7566036: Implement SyncableServices in TemplateURLService. Add related unittests.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/search_engines/template_url.cc

Issue 7566036: Implement SyncableServices in TemplateURLService. Add related unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Recommitting patch. Repaired memory leaks and adjusted unittests to reflect changes. Created 9 years, 4 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.cc

===================================================================

--- chrome/browser/search_engines/template_url.cc (revision 97053)

+++ chrome/browser/search_engines/template_url.cc (working copy)

@@ -15,6 +15,7 @@

#include "chrome/browser/search_engines/search_engine_type.h"

#include "chrome/browser/search_engines/search_terms_data.h"

#include "chrome/browser/search_engines/template_url_service.h"

+#include "chrome/common/guid.h"

#include "chrome/common/url_constants.h"

#include "chrome/installer/util/google_update_settings.h"

#include "content/browser/user_metrics.h"

@@ -642,7 +643,8 @@

usage_count_(0),

search_engine_type_(SEARCH_ENGINE_OTHER),

logo_id_(kNoSearchEngineLogo),

- prepopulate_id_(0) {

+ prepopulate_id_(0),

+ sync_guid_(guid::GenerateGUID()) {

}

TemplateURL::~TemplateURL() {

@@ -730,10 +732,7 @@

void TemplateURL::SetPrepopulateId(int id) {

prepopulate_id_ = id;

- if (id > 0)

- SetTemplateURLRefsPrepopulated(true);

- else

- SetTemplateURLRefsPrepopulated(false);

+ SetTemplateURLRefsPrepopulated(id > 0);

}

void TemplateURL::InvalidateCachedValues() const {

« no previous file with comments | « no previous file | chrome/browser/search_engines/template_url_service.h » ('j') | chrome/browser/search_engines/template_url_service.h » ('J')