| Index: chrome/browser/guestview/webview/webview_guest.h
|
| diff --git a/chrome/browser/guestview/webview/webview_guest.h b/chrome/browser/guestview/webview/webview_guest.h
|
| index 53e2f5a0bbc19fb9284ab825d3dc1c058483a210..78e91de7416d46e236924e255a997cbcdc7fcbd4 100644
|
| --- a/chrome/browser/guestview/webview/webview_guest.h
|
| +++ b/chrome/browser/guestview/webview/webview_guest.h
|
| @@ -31,25 +31,21 @@ class WebviewFindFunction;
|
| // a particular embedder WebContents. This happens on either initial navigation
|
| // or through the use of the New Window API, when a new window is attached to
|
| // a particular <webview>.
|
| -class WebViewGuest : public GuestView,
|
| +class WebViewGuest : public GuestView<WebViewGuest>,
|
| public content::NotificationObserver,
|
| public content::WebContentsObserver {
|
| public:
|
| WebViewGuest(content::WebContents* guest_web_contents,
|
| const std::string& embedder_extension_id);
|
|
|
| - static WebViewGuest* From(int embedder_process_id, int instance_id);
|
| - static WebViewGuest* FromWebContents(content::WebContents* contents);
|
| // Returns guestview::kInstanceIDNone if |contents| does not correspond to a
|
| // WebViewGuest.
|
| static int GetViewInstanceId(content::WebContents* contents);
|
| + static const std::string& Type;
|
|
|
| - // GuestView implementation.
|
| + // GuestViewBase implementation.
|
| virtual void Attach(content::WebContents* embedder_web_contents,
|
| const base::DictionaryValue& args) OVERRIDE;
|
| - virtual GuestView::Type GetViewType() const OVERRIDE;
|
| - virtual WebViewGuest* AsWebView() OVERRIDE;
|
| - virtual AdViewGuest* AsAdView() OVERRIDE;
|
|
|
| // GuestDelegate implementation.
|
| virtual void AddMessageToConsole(int32 level,
|
|
|