Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Side by Side Diff: chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc

Issue 18179004: Dismiss action in tab modal dialogs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test for Mac Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views. h" 5 #include "chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views. h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 } 133 }
134 134
135 bool ProfileSigninConfirmationDialogViews::Cancel() { 135 bool ProfileSigninConfirmationDialogViews::Cancel() {
136 if (delegate_) { 136 if (delegate_) {
137 delegate_->OnCancelSignin(); 137 delegate_->OnCancelSignin();
138 delegate_ = NULL; 138 delegate_ = NULL;
139 } 139 }
140 return true; 140 return true;
141 } 141 }
142 142
143 void ProfileSigninConfirmationDialogViews::OnClose() { 143 void ProfileSigninConfirmationDialogViews::OnClosed() {
144 Cancel(); 144 Cancel();
145 } 145 }
146 146
147 ui::ModalType ProfileSigninConfirmationDialogViews::GetModalType() const { 147 ui::ModalType ProfileSigninConfirmationDialogViews::GetModalType() const {
148 return ui::MODAL_TYPE_WINDOW; 148 return ui::MODAL_TYPE_WINDOW;
149 } 149 }
150 150
151 void ProfileSigninConfirmationDialogViews::ViewHierarchyChanged( 151 void ProfileSigninConfirmationDialogViews::ViewHierarchyChanged(
152 const ViewHierarchyChangedDetails& details) { 152 const ViewHierarchyChangedDetails& details) {
153 if (!details.is_add || details.child != this) 153 if (!details.is_add || details.child != this)
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 views::Button* sender, 251 views::Button* sender,
252 const ui::Event& event) { 252 const ui::Event& event) {
253 DCHECK(prompt_for_new_profile_); 253 DCHECK(prompt_for_new_profile_);
254 DCHECK_EQ(continue_signin_button_, sender); 254 DCHECK_EQ(continue_signin_button_, sender);
255 if (delegate_) { 255 if (delegate_) {
256 delegate_->OnContinueSignin(); 256 delegate_->OnContinueSignin();
257 delegate_ = NULL; 257 delegate_ = NULL;
258 } 258 }
259 GetWidget()->Close(); 259 GetWidget()->Close();
260 } 260 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698