chrome/browser/search/instant_service.cc - Issue 268643002: Use the DefaultSearchManager as the exclusive authority on DSE, ignoring Web Data.

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/instant_service.cc

Issue 268643002: Use the DefaultSearchManager as the exclusive authority on DSE, ignoring Web Data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge errors. 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

« chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc ('K') | « chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc ('k') | chrome/browser/search_engines/default_search_manager.cc » ('j') | chrome/browser/search_engines/default_search_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search/instant_service.cc

diff --git a/chrome/browser/search/instant_service.cc b/chrome/browser/search/instant_service.cc

index 5196408d71dcefcc7632d31e12e1feaadc41e056..bcf0ffbea4ffa66a929c0e18442c235757bb6c67 100644

--- a/chrome/browser/search/instant_service.cc

+++ b/chrome/browser/search/instant_service.cc

@@ -13,6 +13,7 @@

#include "chrome/browser/search/local_ntp_source.h"

#include "chrome/browser/search/most_visited_iframe_source.h"

#include "chrome/browser/search/search.h"

+#include "chrome/browser/search/suggestions/suggestions_service.h"

#include "chrome/browser/search/suggestions/suggestions_source.h"

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

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

@@ -119,24 +120,10 @@ InstantService::InstantService(Profile* profile)

profile_, new FaviconSource(profile_, FaviconSource::FAVICON));

content::URLDataSource::Add(profile_, new LocalNtpSource(profile_));

content::URLDataSource::Add(profile_, new MostVisitedIframeSource());

-<<<<<<< HEAD

- content::URLDataSource::Add(

- profile_, new suggestions::SuggestionsSource(profile_));

- profile_pref_registrar_.Init(profile_->GetPrefs());

- profile_pref_registrar_.Add(

- prefs::kDefaultSearchProviderID,

- base::Bind(&InstantService::OnDefaultSearchProviderChanged,

- base::Unretained(this)));

- registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_URL_UPDATED,

- content::Source<Profile>(profile_->GetOriginalProfile()));

-=======

if (suggestions::SuggestionsService::IsEnabled()) {

content::URLDataSource::Add(

profile_, new suggestions::SuggestionsSource(profile_));

}

->>>>>>> dse_turn_it_on_base

gab 2014/05/07 20:25:09 Is your change uploaded from a proper branch base?

}

InstantService::~InstantService() {