chrome/browser/search_engines/template_url_service.cc - Issue 11365181: Remove GetExtensionService from Profile.

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

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: replace missing extension_system include Created 8 years, 1 month 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/search_engines/template_url_service.cc

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

index c2d256f320296a0d5ef3a08e082762d02bc94bc9..dacbf3002f6e04f217140a5db613fd2afcc811bd 100644

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

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

@@ -18,6 +18,7 @@

#include "base/time.h"

#include "base/utf_string_conversions.h"

#include "chrome/browser/extensions/extension_service.h"

+#include "chrome/browser/extensions/extension_system.h"

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

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

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

@@ -1622,7 +1623,8 @@ void TemplateURLService::NotifyLoaded() {

for (PendingExtensionIDs::const_iterator i(pending_extension_ids_.begin());

i != pending_extension_ids_.end(); ++i) {

const extensions::Extension* extension =

- profile_->GetExtensionService()->GetExtensionById(*i, true);

+ extensions::ExtensionSystem::Get(profile_)->extension_service()->

+ GetExtensionById(*i, true);

if (extension)

RegisterExtensionKeyword(extension);

}