Chromium Code Reviews| Index: extensions/browser/guest_view/guest_view_base.h |
| diff --git a/extensions/browser/guest_view/guest_view_base.h b/extensions/browser/guest_view/guest_view_base.h |
| index b881309d16b034d0f9b3e0d86a0f3cba089fbcb7..1bfb1a5d97ed452c859a7cdcc92badb4ee3f38db 100644 |
| --- a/extensions/browser/guest_view/guest_view_base.h |
| +++ b/extensions/browser/guest_view/guest_view_base.h |
| @@ -27,7 +27,6 @@ namespace extensions { |
| // WebContents. At that point, its lifetime is restricted in scope to the |
| // lifetime of its embedder WebContents. |
| class GuestViewBase : public content::BrowserPluginGuestDelegate, |
| - public content::RenderProcessHostObserver, |
| public content::WebContentsDelegate, |
| public content::WebContentsObserver { |
| public: |
| @@ -171,10 +170,10 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate, |
| const base::DictionaryValue& create_params, |
| const WebContentsCreatedCallback& callback); |
| - void InitWithWebContents( |
| - const std::string& embedder_extension_id, |
| - int embedder_render_process_id, |
| - content::WebContents* guest_web_contents); |
| + void InitWithWebContents(const std::string& embedder_extension_id, |
| + int embedder_render_process_id, |
|
Fady Samuel
2014/10/08 21:45:32
Remove this.
lfg
2014/10/08 23:25:36
Done.
|
| + content::WebContents* embedder_web_contents, |
| + content::WebContents* guest_web_contents); |
| bool IsViewType(const char* const view_type) const { |
| return !strcmp(GetViewType(), view_type); |
| @@ -229,12 +228,6 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate, |
| void SetAttachParams(const base::DictionaryValue& params); |
| void SetOpener(GuestViewBase* opener); |
| - // RenderProcessHostObserver implementation |
| - virtual void RenderProcessExited(content::RenderProcessHost* host, |
| - base::ProcessHandle handle, |
| - base::TerminationStatus status, |
| - int exit_code) override; |
| - |
| // BrowserPluginGuestDelegate implementation. |
| virtual void DidAttach(int guest_proxy_routing_id) override final; |
| virtual void ElementSizeChanged(const gfx::Size& old_size, |
| @@ -263,6 +256,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate, |
| void CompleteInit(const std::string& embedder_extension_id, |
| int embedder_render_process_id, |
|
Fady Samuel
2014/10/08 21:45:32
Remove this.
lfg
2014/10/08 23:25:36
Done.
|
| + content::WebContents* embedder_web_contents, |
| const WebContentsCreatedCallback& callback, |
| content::WebContents* guest_web_contents); |