chrome/browser/ui/startup/startup_browser_creator_win.cc - Issue 17022004: Replace --google-base-suggest-url and --instant-url with --google-base-url.

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/startup/startup_browser_creator_win.cc

Issue 17022004: Replace --google-base-suggest-url and --instant-url with --google-base-url. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 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:

Index: chrome/browser/ui/startup/startup_browser_creator_win.cc

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

--- chrome/browser/ui/startup/startup_browser_creator_win.cc (revision 208572)

+++ chrome/browser/ui/startup/startup_browser_creator_win.cc (working copy)

@@ -6,9 +6,7 @@

#include "base/logging.h"

#include "base/win/metro.h"

-#include "chrome/browser/search_engines/template_url.h"

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

-#include "chrome/browser/search_engines/template_url_service_factory.h"

+#include "chrome/browser/search_engines/util.h"

#include "chrome/browser/ui/browser_finder.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/startup/startup_browser_creator_impl.h"

@@ -23,20 +21,10 @@

base::win::GetMetroLaunchParams(&params);

if ((launch_type == base::win::METRO_PROTOCOL) ||

- (launch_type == base::win::METRO_LAUNCH)) {

+ (launch_type == base::win::METRO_LAUNCH))

return GURL(params);

- } else if (launch_type == base::win::METRO_SEARCH) {

- const TemplateURL* default_provider =

- TemplateURLServiceFactory::GetForProfile(profile)->

- GetDefaultSearchProvider();

- if (default_provider) {

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

- DCHECK(search_url.SupportsReplacement());

- return GURL(search_url.ReplaceSearchTerms(

- TemplateURLRef::SearchTermsArgs(params)));

- }

- return GURL();

+ return (launch_type == base::win::METRO_SEARCH) ?

+ GetDefaultSearchURLForSearchTerms(profile, params) : GURL();

}

} // namespace chrome