Chromium Code Reviews| Index: extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h |
| diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h |
| index 26c0e118f04b26d97dc9e71ed73c1e5fe78f63e2..164c98d3cd960222e1ef8e04904219895a35b292 100644 |
| --- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h |
| +++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h |
| @@ -57,38 +57,40 @@ class MimeHandlerViewGuest : |
| static const char Type[]; |
| + protected: |
| + explicit MimeHandlerViewGuest(content::WebContents* owner_web_contents); |
| + ~MimeHandlerViewGuest() override; |
| + |
| // GuestViewBase implementation. |
| - const char* GetAPINamespace() const override; |
| - int GetTaskPrefix() const override; |
| void CreateWebContents(const base::DictionaryValue& create_params, |
|
Fady Samuel
2015/10/09 22:35:19
Why are these protected and not private?
paulmeyer
2015/10/16 21:13:03
Because they are overridden by TestMimeHandlerView
Fady Samuel
2015/10/16 21:17:28
Make TestMimeHandlerViewGuest a friend class inste
paulmeyer
2015/10/21 19:45:12
Done.
|
| const WebContentsCreatedCallback& callback) override; |
| void DidAttachToEmbedder() override; |
| - void DidInitialize(const base::DictionaryValue& create_params) override; |
| - bool ShouldHandleFindRequestsForEmbedder() const override; |
| - bool ZoomPropagatesFromEmbedderToGuest() const override; |
| + |
| + private: |
| + // GuestViewBase implementation. |
| + const char* GetAPINamespace() const final; |
| + int GetTaskPrefix() const final; |
| + void DidInitialize(const base::DictionaryValue& create_params) final; |
| + bool ShouldHandleFindRequestsForEmbedder() const final; |
| + bool ZoomPropagatesFromEmbedderToGuest() const final; |
| // WebContentsDelegate implementation. |
| content::WebContents* OpenURLFromTab( |
| content::WebContents* source, |
| - const content::OpenURLParams& params) override; |
| - bool HandleContextMenu(const content::ContextMenuParams& params) override; |
| + const content::OpenURLParams& params) final; |
| + bool HandleContextMenu(const content::ContextMenuParams& params) final; |
| bool PreHandleGestureEvent(content::WebContents* source, |
| - const blink::WebGestureEvent& event) override; |
| + const blink::WebGestureEvent& event) final; |
| content::JavaScriptDialogManager* GetJavaScriptDialogManager( |
| - content::WebContents* source) override; |
| - bool SaveFrame(const GURL& url, const content::Referrer& referrer) override; |
| + content::WebContents* source) final; |
| + bool SaveFrame(const GURL& url, const content::Referrer& referrer) final; |
| // content::WebContentsObserver implementation. |
| - void DocumentOnLoadCompletedInMainFrame() override; |
| + void DocumentOnLoadCompletedInMainFrame() final; |
| std::string view_id() const { return view_id_; } |
| base::WeakPtr<StreamContainer> GetStream() const; |
| - protected: |
| - explicit MimeHandlerViewGuest(content::WebContents* owner_web_contents); |
| - ~MimeHandlerViewGuest() override; |
| - |
| - private: |
| scoped_ptr<MimeHandlerViewGuestDelegate> delegate_; |
| scoped_ptr<StreamContainer> stream_; |
| std::string view_id_; |