| Index: chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.h
|
| diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.h b/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.h
|
| index c22d0cc753c36d3191ad164c7670322670c327f0..6c1901a17e3af5c955f0ac040c53a904d4b38892 100644
|
| --- a/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.h
|
| +++ b/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.h
|
| @@ -5,7 +5,7 @@
|
| #ifndef CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_GUEST_DELEGATE_H_
|
| #define CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_GUEST_DELEGATE_H_
|
|
|
| -#include "extensions/browser/guest_view/web_view/web_view_guest.h"
|
| +#include "chrome/browser/guest_view/web_view/web_view_guest.h"
|
| #include "extensions/browser/guest_view/web_view/web_view_guest_delegate.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| @@ -29,7 +29,6 @@
|
| virtual bool HandleContextMenu(
|
| const content::ContextMenuParams& params) OVERRIDE;
|
| virtual void OnAttachWebViewHelpers(content::WebContents* contents) OVERRIDE;
|
| - virtual void OnEmbedderDestroyed() OVERRIDE;
|
| virtual void OnDidCommitProvisionalLoadForFrame(bool is_main_frame) OVERRIDE;
|
| virtual void OnDidInitialize() OVERRIDE;
|
| virtual void OnDocumentLoadedInFrame(
|
| @@ -42,7 +41,7 @@
|
|
|
| private:
|
| content::WebContents* guest_web_contents() const {
|
| - return web_view_guest()->guest_web_contents();
|
| + return web_view_guest_->guest_web_contents();
|
| }
|
|
|
| // Returns the top level items (ignoring submenus) as Value.
|
| @@ -71,6 +70,8 @@
|
| // shown. This is .Reset() after ShowContextMenu().
|
| scoped_ptr<RenderViewContextMenu> pending_menu_;
|
|
|
| + extensions::WebViewGuest* web_view_guest_;
|
| +
|
| #if defined(OS_CHROMEOS)
|
| // Subscription to receive notifications on changes to a11y settings.
|
| scoped_ptr<chromeos::AccessibilityStatusSubscription>
|
|
|