Index: ui/views/controls/webview/web_dialog_view.h |
diff --git a/ui/views/controls/webview/web_dialog_view.h b/ui/views/controls/webview/web_dialog_view.h |
index 40d7616e62eee861bd101cbe0dac8322ee065c89..a910906060b1ab554d9a5e1af2b1e307adfebe16 100644 |
--- a/ui/views/controls/webview/web_dialog_view.h |
+++ b/ui/views/controls/webview/web_dialog_view.h |
@@ -46,75 +46,71 @@ class WEBVIEW_EXPORT WebDialogView : public views::ClientView, |
WebDialogView(content::BrowserContext* context, |
ui::WebDialogDelegate* delegate, |
WebContentsHandler* handler); |
- virtual ~WebDialogView(); |
+ ~WebDialogView() override; |
// For testing. |
content::WebContents* web_contents(); |
// Overridden from views::ClientView: |
- virtual gfx::Size GetPreferredSize() const override; |
- virtual gfx::Size GetMinimumSize() const override; |
- virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) |
- override; |
- virtual void ViewHierarchyChanged( |
+ gfx::Size GetPreferredSize() const override; |
+ gfx::Size GetMinimumSize() const override; |
+ bool AcceleratorPressed(const ui::Accelerator& accelerator) override; |
+ void ViewHierarchyChanged( |
const ViewHierarchyChangedDetails& details) override; |
- virtual bool CanClose() override; |
+ bool CanClose() override; |
// Overridden from views::WidgetDelegate: |
- virtual bool CanResize() const override; |
- virtual ui::ModalType GetModalType() const override; |
- virtual base::string16 GetWindowTitle() const override; |
- virtual std::string GetWindowName() const override; |
- virtual void WindowClosing() override; |
- virtual views::View* GetContentsView() override; |
- virtual ClientView* CreateClientView(views::Widget* widget) override; |
- virtual views::View* GetInitiallyFocusedView() override; |
- virtual bool ShouldShowWindowTitle() const override; |
- virtual views::Widget* GetWidget() override; |
- virtual const views::Widget* GetWidget() const override; |
+ bool CanResize() const override; |
+ ui::ModalType GetModalType() const override; |
+ base::string16 GetWindowTitle() const override; |
+ std::string GetWindowName() const override; |
+ void WindowClosing() override; |
+ views::View* GetContentsView() override; |
+ ClientView* CreateClientView(views::Widget* widget) override; |
+ views::View* GetInitiallyFocusedView() override; |
+ bool ShouldShowWindowTitle() const override; |
+ views::Widget* GetWidget() override; |
+ const views::Widget* GetWidget() const override; |
// Overridden from ui::WebDialogDelegate: |
- virtual ui::ModalType GetDialogModalType() const override; |
- virtual base::string16 GetDialogTitle() const override; |
- virtual GURL GetDialogContentURL() const override; |
- virtual void GetWebUIMessageHandlers( |
+ ui::ModalType GetDialogModalType() const override; |
+ base::string16 GetDialogTitle() const override; |
+ GURL GetDialogContentURL() const override; |
+ void GetWebUIMessageHandlers( |
std::vector<content::WebUIMessageHandler*>* handlers) const override; |
- virtual void GetDialogSize(gfx::Size* size) const override; |
- virtual void GetMinimumDialogSize(gfx::Size* size) const override; |
- virtual std::string GetDialogArgs() const override; |
- virtual void OnDialogShown( |
- content::WebUI* webui, |
- content::RenderViewHost* render_view_host) override; |
- virtual void OnDialogClosed(const std::string& json_retval) override; |
- virtual void OnDialogCloseFromWebUI( |
- const std::string& json_retval) override; |
- virtual void OnCloseContents(content::WebContents* source, |
- bool* out_close_dialog) override; |
- virtual bool ShouldShowDialogTitle() const override; |
- virtual bool HandleContextMenu( |
- const content::ContextMenuParams& params) override; |
+ void GetDialogSize(gfx::Size* size) const override; |
+ void GetMinimumDialogSize(gfx::Size* size) const override; |
+ std::string GetDialogArgs() const override; |
+ void OnDialogShown(content::WebUI* webui, |
+ content::RenderViewHost* render_view_host) override; |
+ void OnDialogClosed(const std::string& json_retval) override; |
+ void OnDialogCloseFromWebUI(const std::string& json_retval) override; |
+ void OnCloseContents(content::WebContents* source, |
+ bool* out_close_dialog) override; |
+ bool ShouldShowDialogTitle() const override; |
+ bool HandleContextMenu(const content::ContextMenuParams& params) override; |
// Overridden from content::WebContentsDelegate: |
- virtual void MoveContents(content::WebContents* source, |
- const gfx::Rect& pos) override; |
- virtual void HandleKeyboardEvent( |
+ void MoveContents(content::WebContents* source, |
+ const gfx::Rect& pos) override; |
+ void HandleKeyboardEvent( |
content::WebContents* source, |
const content::NativeWebKeyboardEvent& event) override; |
- virtual void CloseContents(content::WebContents* source) override; |
- virtual content::WebContents* OpenURLFromTab( |
+ void CloseContents(content::WebContents* source) override; |
+ content::WebContents* OpenURLFromTab( |
content::WebContents* source, |
const content::OpenURLParams& params) override; |
- virtual void AddNewContents(content::WebContents* source, |
- content::WebContents* new_contents, |
- WindowOpenDisposition disposition, |
- const gfx::Rect& initial_pos, |
- bool user_gesture, |
- bool* was_blocked) override; |
- virtual void LoadingStateChanged(content::WebContents* source, |
- bool to_different_document) override; |
- virtual void BeforeUnloadFired(content::WebContents* tab, |
- bool proceed, |
- bool* proceed_to_fire_unload) override; |
+ void AddNewContents(content::WebContents* source, |
+ content::WebContents* new_contents, |
+ WindowOpenDisposition disposition, |
+ const gfx::Rect& initial_pos, |
+ bool user_gesture, |
+ bool* was_blocked) override; |
+ void LoadingStateChanged(content::WebContents* source, |
+ bool to_different_document) override; |
+ void BeforeUnloadFired(content::WebContents* tab, |
+ bool proceed, |
+ bool* proceed_to_fire_unload) override; |
private: |
FRIEND_TEST_ALL_PREFIXES(WebDialogBrowserTest, WebContentRendered); |