| Index: trunk/src/chrome/browser/guest_view/web_view/web_view_guest.h
|
| ===================================================================
|
| --- trunk/src/chrome/browser/guest_view/web_view/web_view_guest.h (revision 287745)
|
| +++ trunk/src/chrome/browser/guest_view/web_view/web_view_guest.h (working copy)
|
| @@ -95,11 +95,6 @@
|
| 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;
|
| @@ -161,6 +156,8 @@
|
| // 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,
|
| @@ -278,6 +275,7 @@
|
| 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);
|
| @@ -336,8 +334,6 @@
|
|
|
| bool HandleKeyboardShortcuts(const content::NativeWebKeyboardEvent& event);
|
|
|
| - void SetUpAutoSize();
|
| -
|
| ObserverList<extensions::TabHelper::ScriptExecutionObserver>
|
| script_observers_;
|
| scoped_ptr<extensions::ScriptExecutor> script_executor_;
|
|
|