chrome/browser/ui/browser_init.cc - Issue 9965143: Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will mak…

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/ui/browser_init.cc

Issue 9965143: Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will mak… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 9 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/sync/test/integration/two_client_search_engines_sync_test.cc ('k') | chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser_init.cc

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

--- chrome/browser/ui/browser_init.cc (revision 130565)

+++ chrome/browser/ui/browser_init.cc (working copy)

@@ -1631,11 +1631,11 @@

const TemplateURL* default_provider =

TemplateURLServiceFactory::GetForProfile(profile)->

GetDefaultSearchProvider();

- if (default_provider && !default_provider->url().empty()) {

- const TemplateURLRef& search_url = default_provider->url_ref();

- DCHECK(search_url.SupportsReplacement());

+ if (default_provider && default_provider->url()) {

+ const TemplateURLRef* search_url = default_provider->url();

+ DCHECK(search_url->SupportsReplacement());

string16 search_term = param.LossyDisplayName().substr(2);

- urls.push_back(GURL(search_url.ReplaceSearchTermsUsingProfile(

+ urls.push_back(GURL(search_url->ReplaceSearchTermsUsingProfile(

profile, search_term, TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,

string16())));

continue;