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

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

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

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chrome_content_browser_client.cc ('K') | « chrome/browser/extensions/extension_toolbar_model_browsertest.cc ('k') | chrome/browser/extensions/options_page_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/navigation_observer.cc

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

index 449bede762e4fb8fd9ec2dcfead3ba787f27928e..18536542d4d4bd57e718966a79a0e8b6febc338e 100644

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

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

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

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

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

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

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

#include "content/public/browser/navigation_controller.h"

#include "content/public/browser/navigation_entry.h"

@@ -55,7 +56,8 @@ void NavigationObserver::PromptToEnableExtensionIfNecessary(

if (!nav_entry)

return;

- ExtensionService* extension_service = profile_->GetExtensionService();

+ ExtensionService* extension_service =

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

const Extension* extension = extension_service->disabled_extensions()->

GetExtensionOrAppByURL(ExtensionURLInfo(nav_entry->GetURL()));

if (!extension)

@@ -80,7 +82,8 @@ void NavigationObserver::PromptToEnableExtensionIfNecessary(

}

void NavigationObserver::InstallUIProceed() {

- ExtensionService* extension_service = profile_->GetExtensionService();

+ ExtensionService* extension_service =

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

const Extension* extension = extension_service->GetExtensionById(

in_progress_prompt_extension_id_, true);

NavigationController* nav_controller =

@@ -100,7 +103,8 @@ void NavigationObserver::InstallUIProceed() {

}

void NavigationObserver::InstallUIAbort(bool user_initiated) {

- ExtensionService* extension_service = profile_->GetExtensionService();

+ ExtensionService* extension_service =

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

const Extension* extension = extension_service->GetExtensionById(

in_progress_prompt_extension_id_, true);