chrome/browser/extensions/navigation_observer.cc - Issue 156843004: Remove ExtensionService::extension_prefs()

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/extensions/navigation_observer.cc

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix UserScriptListenerTests.MultiProfile Created 6 years, 10 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/extensions/navigation_observer.cc

diff --git a/chrome/browser/extensions/navigation_observer.cc b/chrome/browser/extensions/navigation_observer.cc

index 252d0bcfafa34d1158a6c2f2675b6334810a66fb..4d79c6c6b2274808df5246e1f7decc0d9e23f514 100644

--- a/chrome/browser/extensions/navigation_observer.cc

+++ b/chrome/browser/extensions/navigation_observer.cc

@@ -69,9 +69,7 @@ void NavigationObserver::PromptToEnableExtensionIfNecessary(

return;

prompted_extensions_.insert(extension->id());

- ExtensionService* extension_service =

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

- ExtensionPrefs* extension_prefs = extension_service->extension_prefs();

+ ExtensionPrefs* extension_prefs = ExtensionPrefs::Get(profile_);

if (extension_prefs->DidExtensionEscalatePermissions(extension->id())) {

// Keep track of the extension id and nav controller we're prompting for.

// These must be reset in InstallUIProceed and InstallUIAbort.