chrome/browser/extensions/api/declarative_content/content_action.cc - Issue 290293002: clenaup: Removed deprecated GetInstalledExtension function from c/b/e/api

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/api/declarative_content/content_action.cc

Issue 290293002: clenaup: Removed deprecated GetInstalledExtension function from c/b/e/api (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « chrome/browser/extensions/api/declarative/rules_cache_delegate.cc ('k') | chrome/browser/extensions/api/declarative_content/content_rules_registry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/declarative_content/content_action.cc

diff --git a/chrome/browser/extensions/api/declarative_content/content_action.cc b/chrome/browser/extensions/api/declarative_content/content_action.cc

index cf279690d2b94a7b25da00590dddf69d7ab28e0b..751f8d53383c946c633b1ef23066a414675e8554 100644

--- a/chrome/browser/extensions/api/declarative_content/content_action.cc

+++ b/chrome/browser/extensions/api/declarative_content/content_action.cc

@@ -12,12 +12,11 @@

#include "chrome/browser/extensions/api/declarative_content/content_constants.h"

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

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

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

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

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

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

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

-#include "extensions/browser/extension_system.h"

+#include "extensions/browser/extension_registry.h"

#include "extensions/common/extension.h"

namespace extensions {

@@ -83,9 +82,9 @@ class ShowPageAction : public ContentAction {

private:

static ExtensionAction* GetPageAction(Profile* profile,

const std::string& extension_id) {

- ExtensionService* service =

- ExtensionSystem::Get(profile)->extension_service();

- const Extension* extension = service->GetInstalledExtension(extension_id);

+ const Extension* extension =

+ ExtensionRegistry::Get(profile)

+ ->GetExtensionById(extension_id, ExtensionRegistry::EVERYTHING);

if (!extension)

return NULL;

return ExtensionActionManager::Get(profile)->GetPageAction(*extension);