| Index: chrome/browser/ui/sync/one_click_signin_helper.cc
|
| diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc
|
| index b4341f010cb4f546bb5e0c499bd34d7e7601aa1d..f1e9de93dcc9ed8c11d7139799212c06fcf68178 100644
|
| --- a/chrome/browser/ui/sync/one_click_signin_helper.cc
|
| +++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
|
| @@ -117,18 +117,18 @@ class ConfirmEmailDialogDelegate : public TabModalConfirmDialogDelegate {
|
| const std::string& last_email,
|
| const std::string& email,
|
| Callback callback);
|
| - virtual ~ConfirmEmailDialogDelegate();
|
| + ~ConfirmEmailDialogDelegate() override;
|
|
|
| // TabModalConfirmDialogDelegate:
|
| - virtual base::string16 GetTitle() override;
|
| - virtual base::string16 GetDialogMessage() override;
|
| - virtual base::string16 GetAcceptButtonTitle() override;
|
| - virtual base::string16 GetCancelButtonTitle() override;
|
| - virtual base::string16 GetLinkText() const override;
|
| - virtual void OnAccepted() override;
|
| - virtual void OnCanceled() override;
|
| - virtual void OnClosed() override;
|
| - virtual void OnLinkClicked(WindowOpenDisposition disposition) override;
|
| + base::string16 GetTitle() override;
|
| + base::string16 GetDialogMessage() override;
|
| + base::string16 GetAcceptButtonTitle() override;
|
| + base::string16 GetCancelButtonTitle() override;
|
| + base::string16 GetLinkText() const override;
|
| + void OnAccepted() override;
|
| + void OnCanceled() override;
|
| + void OnClosed() override;
|
| + void OnLinkClicked(WindowOpenDisposition disposition) override;
|
|
|
| std::string last_email_;
|
| std::string email_;
|
| @@ -429,11 +429,11 @@ std::string GetSigninScopedDeviceId(Profile* profile) {
|
| class CurrentHistoryCleaner : public content::WebContentsObserver {
|
| public:
|
| explicit CurrentHistoryCleaner(content::WebContents* contents);
|
| - virtual ~CurrentHistoryCleaner();
|
| + ~CurrentHistoryCleaner() override;
|
|
|
| // content::WebContentsObserver:
|
| - virtual void WebContentsDestroyed() override;
|
| - virtual void DidCommitProvisionalLoadForFrame(
|
| + void WebContentsDestroyed() override;
|
| + void DidCommitProvisionalLoadForFrame(
|
| content::RenderFrameHost* render_frame_host,
|
| const GURL& url,
|
| ui::PageTransition transition_type) override;
|
|
|