| 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 9b9dca5949606e71fa3b3b98858e69a6db89aff7..f016fabaa59022b472a1682c8becd4f904ece132 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
|
| @@ -20,11 +20,12 @@ namespace ui {
|
| class SimpleMenuModel;
|
| } // namespace ui
|
|
|
| -class ChromeWebViewGuestDelegate : public extensions::WebViewGuestDelegate,
|
| +namespace extensions {
|
| +
|
| +class ChromeWebViewGuestDelegate : public WebViewGuestDelegate,
|
| public ZoomObserver {
|
| public :
|
| - explicit ChromeWebViewGuestDelegate(
|
| - extensions::WebViewGuest* web_view_guest);
|
| + explicit ChromeWebViewGuestDelegate(WebViewGuest* web_view_guest);
|
| ~ChromeWebViewGuestDelegate() override;
|
|
|
| // WebViewGuestDelegate implementation.
|
| @@ -44,7 +45,7 @@ class ChromeWebViewGuestDelegate : public extensions::WebViewGuestDelegate,
|
| // ZoomObserver implementation.
|
| void OnZoomChanged(const ZoomController::ZoomChangedEventData& data) override;
|
|
|
| - extensions::WebViewGuest* web_view_guest() const { return web_view_guest_; }
|
| + WebViewGuest* web_view_guest() const { return web_view_guest_; }
|
|
|
| private:
|
| content::WebContents* guest_web_contents() const {
|
| @@ -83,7 +84,7 @@ class ChromeWebViewGuestDelegate : public extensions::WebViewGuestDelegate,
|
| accessibility_subscription_;
|
| #endif
|
|
|
| - extensions::WebViewGuest* const web_view_guest_;
|
| + WebViewGuest* const web_view_guest_;
|
|
|
| // This is used to ensure pending tasks will not fire after this object is
|
| // destroyed.
|
| @@ -92,5 +93,7 @@ class ChromeWebViewGuestDelegate : public extensions::WebViewGuestDelegate,
|
| DISALLOW_COPY_AND_ASSIGN(ChromeWebViewGuestDelegate);
|
| };
|
|
|
| +} // namespace extensions
|
| +
|
| #endif // CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_CHROME_WEB_VIEW_GUEST_DELEGATE_H_
|
|
|
|
|