diff options
| author | Tommy C. Li <tommycli@chromium.org> | 2015-04-02 17:21:10 -0700 |
|---|---|---|
| committer | Tommy C. Li <tommycli@chromium.org> | 2015-04-03 00:23:03 +0000 |
| commit | fa6680c30a495db2922bc286b9e5461e5dcc579e (patch) | |
| tree | 374497676e2d76ad1af747888156e3906dc6ff53 /extensions/browser/extension_web_contents_observer.cc | |
| parent | bd6b7ec8c71da55fc79039374af97f77e5b2051b (diff) | |
| download | chromium_src-fa6680c30a495db2922bc286b9e5461e5dcc579e.zip chromium_src-fa6680c30a495db2922bc286b9e5461e5dcc579e.tar.gz chromium_src-fa6680c30a495db2922bc286b9e5461e5dcc579e.tar.bz2 | |
Revert "[Extensions] Changt cl uploade ProcessManager to use RenderFrameHosts"
This reverts commit 93a2547e8519ce060379102a611d58f767c72ece.
BUG=
Review URL: https://codereview.chromium.org/1058183002
Cr-Commit-Position: refs/heads/master@{#323574}
Diffstat (limited to 'extensions/browser/extension_web_contents_observer.cc')
| -rw-r--r-- | extensions/browser/extension_web_contents_observer.cc | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/extensions/browser/extension_web_contents_observer.cc b/extensions/browser/extension_web_contents_observer.cc index dd0a628..020cc32 100644 --- a/extensions/browser/extension_web_contents_observer.cc +++ b/extensions/browser/extension_web_contents_observer.cc @@ -5,7 +5,6 @@ #include "extensions/browser/extension_web_contents_observer.h" #include "content/public/browser/child_process_security_policy.h" -#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" @@ -14,7 +13,6 @@ #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/mojo/service_registration.h" -#include "extensions/browser/process_manager.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/constants.h" #include "extensions/common/extension_messages.h" @@ -26,13 +24,9 @@ ExtensionWebContentsObserver::ExtensionWebContentsObserver( : content::WebContentsObserver(web_contents), browser_context_(web_contents->GetBrowserContext()) { NotifyRenderViewType(web_contents->GetRenderViewHost()); - content::RenderFrameHost* host = web_contents->GetMainFrame(); - if (host) - RenderFrameHostChanged(nullptr, host); } -ExtensionWebContentsObserver::~ExtensionWebContentsObserver() { -} +ExtensionWebContentsObserver::~ExtensionWebContentsObserver() {} void ExtensionWebContentsObserver::RenderViewCreated( content::RenderViewHost* render_view_host) { @@ -101,26 +95,6 @@ void ExtensionWebContentsObserver::RenderFrameCreated( RegisterCoreExtensionServices(render_frame_host); } -void ExtensionWebContentsObserver::FrameDeleted( - content::RenderFrameHost* render_frame_host) { - ProcessManager::Get(browser_context_)->UnregisterRenderFrameHost( - render_frame_host); -} - -void ExtensionWebContentsObserver::RenderFrameHostChanged( - content::RenderFrameHost* old_host, - content::RenderFrameHost* new_host) { - ProcessManager* process_manager = ProcessManager::Get(browser_context_); - if (old_host) - process_manager->UnregisterRenderFrameHost(old_host); - - const Extension* extension = GetExtension(new_host->GetRenderViewHost()); - if (extension) { - process_manager->RegisterRenderFrameHost( - web_contents(), new_host, extension); - } -} - void ExtensionWebContentsObserver::NotifyRenderViewType( content::RenderViewHost* render_view_host) { if (render_view_host) { |