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

Side by Side Diff: chrome/browser/ui/views/ssl_client_certificate_selector.cc

Issue 11571023: Move ash/wm's DialogFrameView to ui/views/window; etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reorder DialogDelegate functions; inline Get*Params into WidgetExample::ButtonPressed; etc. Created 8 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ssl_client_certificate_selector.h" 5 #include "chrome/browser/ui/views/ssl_client_certificate_selector.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/i18n/time_formatting.h" 8 #include "base/i18n/time_formatting.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 return true; 206 return true;
207 } 207 }
208 208
209 return false; 209 return false;
210 } 210 }
211 211
212 views::View* SSLClientCertificateSelector::GetInitiallyFocusedView() { 212 views::View* SSLClientCertificateSelector::GetInitiallyFocusedView() {
213 return table_; 213 return table_;
214 } 214 }
215 215
216 views::View* SSLClientCertificateSelector::GetContentsView() {
217 return this;
218 }
219
220 views::View* SSLClientCertificateSelector::GetExtraView() { 216 views::View* SSLClientCertificateSelector::GetExtraView() {
221 return view_cert_button_container_; 217 return view_cert_button_container_;
222 } 218 }
223 219
224 ui::ModalType SSLClientCertificateSelector::GetModalType() const { 220 ui::ModalType SSLClientCertificateSelector::GetModalType() const {
225 #if defined(USE_ASH) 221 #if defined(USE_ASH)
226 return ui::MODAL_TYPE_CHILD; 222 return ui::MODAL_TYPE_CHILD;
227 #else 223 #else
228 return views::WidgetDelegate::GetModalType(); 224 return views::WidgetDelegate::GetModalType();
229 #endif 225 #endif
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 const net::HttpNetworkSession* network_session, 290 const net::HttpNetworkSession* network_session,
295 net::SSLCertRequestInfo* cert_request_info, 291 net::SSLCertRequestInfo* cert_request_info,
296 const chrome::SelectCertificateCallback& callback) { 292 const chrome::SelectCertificateCallback& callback) {
297 DVLOG(1) << __FUNCTION__ << " " << contents; 293 DVLOG(1) << __FUNCTION__ << " " << contents;
298 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 294 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
299 (new SSLClientCertificateSelector( 295 (new SSLClientCertificateSelector(
300 contents, network_session, cert_request_info, callback))->Init(); 296 contents, network_session, cert_request_info, callback))->Init();
301 } 297 }
302 298
303 } // namespace chrome 299 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ssl_client_certificate_selector.h ('k') | chrome/browser/ui/views/task_manager_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698