Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(380)

Unified Diff: components/renderer_context_menu/context_menu_content_type.cc

Issue 671763002: Extract ProcessManager from ExtensionSystem. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 6 years, 2 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/ui/webui/extensions/extension_settings_handler.cc ('k') | extensions/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/renderer_context_menu/context_menu_content_type.cc
diff --git a/components/renderer_context_menu/context_menu_content_type.cc b/components/renderer_context_menu/context_menu_content_type.cc
index befb042a96c652757a6e21f32917b0de050e0e4e..c5c9f3f18463efabe459d03eb6e4ced87fa98ceb 100644
--- a/components/renderer_context_menu/context_menu_content_type.cc
+++ b/components/renderer_context_menu/context_menu_content_type.cc
@@ -10,7 +10,6 @@
#include "third_party/WebKit/public/web/WebContextMenuData.h"
#if defined(ENABLE_EXTENSIONS)
-#include "extensions/browser/extension_system.h"
#include "extensions/browser/process_manager.h"
#include "extensions/common/extension.h"
#endif
@@ -20,6 +19,7 @@ using content::WebContents;
#if defined(ENABLE_EXTENSIONS)
using extensions::Extension;
+using extensions::ProcessManager;
#endif
namespace {
@@ -50,13 +50,9 @@ ContextMenuContentType::~ContextMenuContentType() {
#if defined(ENABLE_EXTENSIONS)
const Extension* ContextMenuContentType::GetExtension() const {
- extensions::ExtensionSystem* system = extensions::ExtensionSystem::Get(
- source_web_contents_->GetBrowserContext());
- // There is no process manager in some tests.
- if (!system->process_manager())
- return NULL;
-
- return system->process_manager()->GetExtensionForRenderViewHost(
+ ProcessManager* process_manager =
+ ProcessManager::Get(source_web_contents_->GetBrowserContext());
+ return process_manager->GetExtensionForRenderViewHost(
source_web_contents_->GetRenderViewHost());
}
#endif
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_settings_handler.cc ('k') | extensions/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698