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 d8d868687bdee004397931dd33dcd0b5ac6d1a95..841af0c876ce9b1133f1e6d842df21bcebd00bc8 100644 |
--- a/extensions/browser/guest_view/guest_view_base.h |
+++ b/extensions/browser/guest_view/guest_view_base.h |
@@ -296,6 +296,26 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate, |
~GuestViewBase() override; |
+ // WebContentsObserver implementation. |
lazyboy
2015/01/23 20:08:01
Also note this private->public changes to overridd
Fady Samuel
2015/01/23 20:13:22
Done. CQ'ing now.
|
+ void DidStopLoading(content::RenderViewHost* render_view_host) final; |
+ void RenderViewReady() final; |
+ void WebContentsDestroyed() final; |
+ |
+ // WebContentsDelegate implementation. |
+ void ActivateContents(content::WebContents* contents) final; |
+ void DeactivateContents(content::WebContents* contents) final; |
+ void ContentsZoomChange(bool zoom_in) override; |
+ void HandleKeyboardEvent( |
+ content::WebContents* source, |
+ const content::NativeWebKeyboardEvent& event) override; |
+ void RunFileChooser(content::WebContents* web_contents, |
+ const content::FileChooserParams& params) override; |
+ bool ShouldFocusPageAfterCrash() final; |
+ bool PreHandleGestureEvent(content::WebContents* source, |
+ const blink::WebGestureEvent& event) final; |
+ void UpdatePreferredSize(content::WebContents* web_contents, |
+ const gfx::Size& pref_size) final; |
+ |
private: |
class OwnerLifetimeObserver; |
@@ -320,26 +340,6 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate, |
static void RegisterGuestViewTypes(); |
- // WebContentsObserver implementation. |
- void DidStopLoading(content::RenderViewHost* render_view_host) final; |
- void RenderViewReady() final; |
- void WebContentsDestroyed() final; |
- |
- // WebContentsDelegate implementation. |
- void ActivateContents(content::WebContents* contents) final; |
- void DeactivateContents(content::WebContents* contents) final; |
- void ContentsZoomChange(bool zoom_in) override; |
- void HandleKeyboardEvent( |
- content::WebContents* source, |
- const content::NativeWebKeyboardEvent& event) override; |
- void RunFileChooser(content::WebContents* web_contents, |
- const content::FileChooserParams& params) override; |
- bool ShouldFocusPageAfterCrash() final; |
- bool PreHandleGestureEvent(content::WebContents* source, |
- const blink::WebGestureEvent& event) final; |
- void UpdatePreferredSize(content::WebContents* web_contents, |
- const gfx::Size& pref_size) final; |
- |
// This guest tracks the lifetime of the WebContents specified by |
// |owner_web_contents_|. If |owner_web_contents_| is destroyed then this |
// guest will also self-destruct. |