chrome/browser/search_engines/template_url.h - Issue 273153004: Revert of Handle TemplateURLService load failure better, and make some test correctness fixes that will be ne…

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.h

Issue 273153004: Revert of Handle TemplateURLService load failure better, and make some test correctness fixes that will be ne… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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/search_engines/default_search_pref_migration_unittest.cc ('k') | chrome/browser/search_engines/template_url.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/template_url.h

diff --git a/chrome/browser/search_engines/template_url.h b/chrome/browser/search_engines/template_url.h

index 9d0435593268b94173aaef96ddecf902347b1273..5d1542bb69c8a4f8aabbeba997a4e0ced89988c9 100644

--- a/chrome/browser/search_engines/template_url.h

+++ b/chrome/browser/search_engines/template_url.h

@@ -567,11 +567,6 @@

// Generates a favicon URL from the specified url.

static GURL GenerateFaviconURL(const GURL& url);

- // Returns true if |t_url| and |data| are equal in all meaningful respects.

- // Static to allow either or both params to be NULL.

- static bool MatchesData(const TemplateURL* t_url,

- const TemplateURLData* data);

Profile* profile() { return profile_; }

const TemplateURLData& data() const { return data_; }

@@ -649,9 +644,6 @@

// Like SupportsReplacement but usable on threads other than the UI thread.

bool SupportsReplacementUsingTermsData(

const SearchTermsData& search_terms_data) const;

- // Returns true if any URLRefs use Googe base URLs.

- bool HasGoogleBaseURLs() const;

// Returns true if this TemplateURL uses Google base URLs and has a keyword

// of "google.TLD". We use this to decide whether we can automatically