Index: chrome/browser/guest_view/web_view/web_view_guest.h |
diff --git a/chrome/browser/guest_view/web_view/web_view_guest.h b/chrome/browser/guest_view/web_view/web_view_guest.h |
index 0150bbf46b81b0ed61a47686b70e90655f47080e..c38a7eeffcd65778501ddb191846ac8e576a2edd 100644 |
--- a/chrome/browser/guest_view/web_view/web_view_guest.h |
+++ b/chrome/browser/guest_view/web_view/web_view_guest.h |
@@ -95,6 +95,11 @@ class WebViewGuest : public GuestView<WebViewGuest>, |
virtual void DidStopLoading() OVERRIDE; |
virtual void EmbedderDestroyed() OVERRIDE; |
virtual void GuestDestroyed() OVERRIDE; |
+ virtual void GuestReady() OVERRIDE; |
+ virtual void GuestSizeChangedDueToAutoSize( |
+ const gfx::Size& old_size, |
+ const gfx::Size& new_size) OVERRIDE; |
+ virtual bool IsAutoSizeSupported() const OVERRIDE; |
virtual bool IsDragAndDropEnabled() const OVERRIDE; |
virtual void WillAttachToEmbedder() OVERRIDE; |
virtual void WillDestroy() OVERRIDE; |
@@ -156,8 +161,6 @@ class WebViewGuest : public GuestView<WebViewGuest>, |
// BrowserPluginGuestDelegate implementation. |
virtual content::WebContents* CreateNewGuestWindow( |
const content::WebContents::CreateParams& create_params) OVERRIDE; |
- virtual void SizeChanged(const gfx::Size& old_size, const gfx::Size& new_size) |
- OVERRIDE; |
virtual void RequestPointerLockPermission( |
bool user_gesture, |
bool last_unlocked_by_target, |
@@ -275,7 +278,6 @@ class WebViewGuest : public GuestView<WebViewGuest>, |
content::RenderFrameHost* render_frame_host) OVERRIDE; |
virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; |
virtual void UserAgentOverrideSet(const std::string& user_agent) OVERRIDE; |
- virtual void RenderViewReady() OVERRIDE; |
// Informs the embedder of a frame name change. |
void ReportFrameNameChange(const std::string& name); |
@@ -334,6 +336,8 @@ class WebViewGuest : public GuestView<WebViewGuest>, |
bool HandleKeyboardShortcuts(const content::NativeWebKeyboardEvent& event); |
+ void SetUpAutoSize(); |
+ |
ObserverList<extensions::TabHelper::ScriptExecutionObserver> |
script_observers_; |
scoped_ptr<extensions::ScriptExecutor> script_executor_; |