| Index: chrome/browser/chromeos/login/ui/simple_web_view_dialog.h
|
| diff --git a/chrome/browser/chromeos/login/ui/simple_web_view_dialog.h b/chrome/browser/chromeos/login/ui/simple_web_view_dialog.h
|
| index 566e19e7318e49ad2114d8b36a2752d803339551..2ce29261913f26dbde9fb8ecaa81596b9fb4c5c5 100644
|
| --- a/chrome/browser/chromeos/login/ui/simple_web_view_dialog.h
|
| +++ b/chrome/browser/chromeos/login/ui/simple_web_view_dialog.h
|
| @@ -53,51 +53,51 @@ class SimpleWebViewDialog : public views::ButtonListener,
|
| void Init();
|
|
|
| // Overridden from views::View:
|
| - virtual void Layout() OVERRIDE;
|
| + virtual void Layout() override;
|
|
|
| // Overridden from views::WidgetDelegate:
|
| - virtual views::View* GetContentsView() OVERRIDE;
|
| - virtual views::View* GetInitiallyFocusedView() OVERRIDE;
|
| + virtual views::View* GetContentsView() override;
|
| + virtual views::View* GetInitiallyFocusedView() override;
|
|
|
| // Implements views::ButtonListener:
|
| virtual void ButtonPressed(views::Button* sender,
|
| - const ui::Event& event) OVERRIDE;
|
| + const ui::Event& event) override;
|
|
|
| // Implements content::PageNavigator:
|
| virtual content::WebContents* OpenURL(
|
| - const content::OpenURLParams& params) OVERRIDE;
|
| + const content::OpenURLParams& params) override;
|
|
|
| // Implements content::WebContentsDelegate:
|
| virtual void NavigationStateChanged(
|
| const content::WebContents* source,
|
| - content::InvalidateTypes changed_flags) OVERRIDE;
|
| + content::InvalidateTypes changed_flags) override;
|
| virtual void LoadingStateChanged(content::WebContents* source,
|
| - bool to_different_document) OVERRIDE;
|
| + bool to_different_document) override;
|
|
|
| // Implements LocationBarView::Delegate:
|
| - virtual content::WebContents* GetWebContents() OVERRIDE;
|
| - virtual ToolbarModel* GetToolbarModel() OVERRIDE;
|
| - virtual const ToolbarModel* GetToolbarModel() const OVERRIDE;
|
| - virtual InstantController* GetInstant() OVERRIDE;
|
| + virtual content::WebContents* GetWebContents() override;
|
| + virtual ToolbarModel* GetToolbarModel() override;
|
| + virtual const ToolbarModel* GetToolbarModel() const override;
|
| + virtual InstantController* GetInstant() override;
|
| virtual views::Widget* CreateViewsBubble(
|
| - views::BubbleDelegateView* bubble_delegate) OVERRIDE;
|
| + views::BubbleDelegateView* bubble_delegate) override;
|
| virtual PageActionImageView* CreatePageActionImageView(
|
| LocationBarView* owner,
|
| - ExtensionAction* action) OVERRIDE;
|
| + ExtensionAction* action) override;
|
| virtual ContentSettingBubbleModelDelegate*
|
| - GetContentSettingBubbleModelDelegate() OVERRIDE;
|
| + GetContentSettingBubbleModelDelegate() override;
|
| virtual void ShowWebsiteSettings(content::WebContents* web_contents,
|
| const GURL& url,
|
| - const content::SSLStatus& ssl) OVERRIDE;
|
| + const content::SSLStatus& ssl) override;
|
|
|
| // Implements ToolbarModelDelegate:
|
| - virtual content::WebContents* GetActiveWebContents() const OVERRIDE;
|
| - virtual bool InTabbedBrowser() const OVERRIDE;
|
| + virtual content::WebContents* GetActiveWebContents() const override;
|
| + virtual bool InTabbedBrowser() const override;
|
|
|
| // Implements CommandUpdaterDelegate:
|
| virtual void ExecuteCommandWithDisposition(
|
| int id,
|
| - WindowOpenDisposition) OVERRIDE;
|
| + WindowOpenDisposition) override;
|
|
|
| private:
|
| friend class SimpleWebViewDialogTest;
|
|
|