| Index: chrome/browser/ui/views/login_prompt_views.cc
|
| diff --git a/chrome/browser/ui/views/login_prompt_views.cc b/chrome/browser/ui/views/login_prompt_views.cc
|
| index 9a0f648ebbfaf34ecd927a22a87e52fc965704c4..75d7abfe92db844dec7168d12014948f98da73ec 100644
|
| --- a/chrome/browser/ui/views/login_prompt_views.cc
|
| +++ b/chrome/browser/ui/views/login_prompt_views.cc
|
| @@ -36,24 +36,24 @@ class LoginHandlerViews : public LoginHandler, public views::DialogDelegate {
|
| // LoginModelObserver:
|
| virtual void OnAutofillDataAvailable(
|
| const base::string16& username,
|
| - const base::string16& password) OVERRIDE {
|
| + const base::string16& password) override {
|
| // Nothing to do here since LoginView takes care of autofill for win.
|
| }
|
| - virtual void OnLoginModelDestroying() OVERRIDE {}
|
| + virtual void OnLoginModelDestroying() override {}
|
|
|
| // views::DialogDelegate:
|
| virtual base::string16 GetDialogButtonLabel(
|
| - ui::DialogButton button) const OVERRIDE {
|
| + ui::DialogButton button) const override {
|
| if (button == ui::DIALOG_BUTTON_OK)
|
| return l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_OK_BUTTON_LABEL);
|
| return DialogDelegate::GetDialogButtonLabel(button);
|
| }
|
|
|
| - virtual base::string16 GetWindowTitle() const OVERRIDE {
|
| + virtual base::string16 GetWindowTitle() const override {
|
| return l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_TITLE);
|
| }
|
|
|
| - virtual void WindowClosing() OVERRIDE {
|
| + virtual void WindowClosing() override {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| content::WebContents* web_contents = GetWebContentsForLogin();
|
| if (web_contents)
|
| @@ -64,7 +64,7 @@ class LoginHandlerViews : public LoginHandler, public views::DialogDelegate {
|
| CancelAuth();
|
| }
|
|
|
| - virtual void DeleteDelegate() OVERRIDE {
|
| + virtual void DeleteDelegate() override {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
| // The widget is going to delete itself; clear our pointer.
|
| @@ -74,40 +74,40 @@ class LoginHandlerViews : public LoginHandler, public views::DialogDelegate {
|
| ReleaseSoon();
|
| }
|
|
|
| - virtual ui::ModalType GetModalType() const OVERRIDE {
|
| + virtual ui::ModalType GetModalType() const override {
|
| return ui::MODAL_TYPE_CHILD;
|
| }
|
|
|
| - virtual bool Cancel() OVERRIDE {
|
| + virtual bool Cancel() override {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| CancelAuth();
|
| return true;
|
| }
|
|
|
| - virtual bool Accept() OVERRIDE {
|
| + virtual bool Accept() override {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| SetAuth(login_view_->GetUsername(), login_view_->GetPassword());
|
| return true;
|
| }
|
|
|
| - virtual views::View* GetInitiallyFocusedView() OVERRIDE {
|
| + virtual views::View* GetInitiallyFocusedView() override {
|
| return login_view_->GetInitiallyFocusedView();
|
| }
|
|
|
| - virtual views::View* GetContentsView() OVERRIDE {
|
| + virtual views::View* GetContentsView() override {
|
| return login_view_;
|
| }
|
| - virtual views::Widget* GetWidget() OVERRIDE {
|
| + virtual views::Widget* GetWidget() override {
|
| return login_view_->GetWidget();
|
| }
|
| - virtual const views::Widget* GetWidget() const OVERRIDE {
|
| + virtual const views::Widget* GetWidget() const override {
|
| return login_view_->GetWidget();
|
| }
|
|
|
| // LoginHandler:
|
| virtual void BuildViewForPasswordManager(
|
| password_manager::PasswordManager* manager,
|
| - const base::string16& explanation) OVERRIDE {
|
| + const base::string16& explanation) override {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
| // Create a new LoginView and set the model for it. The model (password
|
| @@ -126,7 +126,7 @@ class LoginHandlerViews : public LoginHandler, public views::DialogDelegate {
|
| NotifyAuthNeeded();
|
| }
|
|
|
| - virtual void CloseDialog() OVERRIDE {
|
| + virtual void CloseDialog() override {
|
| // The hosting widget may have been freed.
|
| if (dialog_)
|
| dialog_->Close();
|
|
|