chrome/browser/search_engines/template_url_service_factory.cc - Issue 839193002: Move ServiceAccessType into //components/keyed_service

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_service_factory.cc

Issue 839193002: Move ServiceAccessType into //components/keyed_service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix compilation on android Created 5 years, 11 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/safe_browsing/safe_browsing_blocking_page.cc ('k') | chrome/browser/search_engines/template_url_service_test_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/template_url_service_factory.cc

diff --git a/chrome/browser/search_engines/template_url_service_factory.cc b/chrome/browser/search_engines/template_url_service_factory.cc

index 1b745464cd06878f3b23c325cc2bf487835742e6..ffab5b4692cd0fc880c0cd6287a118710e7a5f3a 100644

--- a/chrome/browser/search_engines/template_url_service_factory.cc

+++ b/chrome/browser/search_engines/template_url_service_factory.cc

@@ -12,6 +12,7 @@

#include "chrome/browser/google/google_url_tracker_factory.h"

#include "chrome/browser/history/history_service_factory.h"

#include "chrome/browser/profiles/incognito_helpers.h"

+#include "chrome/browser/profiles/profile.h"

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

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

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

@@ -49,10 +50,10 @@ KeyedService* TemplateURLServiceFactory::BuildInstanceFor(

profile->GetPrefs(),

scoped_ptr<SearchTermsData>(new UIThreadSearchTermsData(profile)),

WebDataServiceFactory::GetKeywordWebDataForProfile(

- profile, Profile::EXPLICIT_ACCESS),

+ profile, ServiceAccessType::EXPLICIT_ACCESS),

scoped_ptr<TemplateURLServiceClient>(new ChromeTemplateURLServiceClient(

- HistoryServiceFactory::GetForProfile(profile,

- Profile::EXPLICIT_ACCESS))),

+ HistoryServiceFactory::GetForProfile(

+ profile, ServiceAccessType::EXPLICIT_ACCESS))),

GoogleURLTrackerFactory::GetForProfile(profile),

g_browser_process->rappor_service(),

dsp_change_callback);