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

Side by Side Diff: chrome/browser/ui/webui/ssl_client_certificate_selector_webui.cc

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 years, 11 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 | 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/webui/ssl_client_certificate_selector_webui.h" 5 #include "chrome/browser/ui/webui/ssl_client_certificate_selector_webui.h"
6 6
7 #include <vector> 7 #include <vector>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/i18n/time_formatting.h" 12 #include "base/i18n/time_formatting.h"
13 #include "base/json/json_reader.h" 13 #include "base/json/json_reader.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "chrome/browser/certificate_viewer.h" 16 #include "chrome/browser/certificate_viewer.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/ssl_client_certificate_selector.h" 18 #include "chrome/browser/ssl_client_certificate_selector.h"
19 #include "chrome/browser/ui/crypto_module_password_dialog.h" 19 #include "chrome/browser/ui/crypto_module_password_dialog.h"
20 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 20 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
21 #include "chrome/browser/ui/webui/chrome_web_ui.h" 21 #include "chrome/browser/ui/webui/chrome_web_ui.h"
22 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" 22 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
23 #include "chrome/browser/ui/webui/constrained_html_ui.h" 23 #include "chrome/browser/ui/webui/constrained_html_ui.h"
24 #include "chrome/common/net/x509_certificate_model.h" 24 #include "chrome/common/net/x509_certificate_model.h"
25 #include "chrome/common/url_constants.h" 25 #include "chrome/common/url_constants.h"
26 #include "content/browser/webui/web_ui.h"
26 #include "grit/browser_resources.h" 27 #include "grit/browser_resources.h"
27 #include "grit/generated_resources.h" 28 #include "grit/generated_resources.h"
28 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
29 #include "ui/gfx/size.h" 30 #include "ui/gfx/size.h"
30 31
31 using content::WebContents; 32 using content::WebContents;
32 using content::WebUIMessageHandler; 33 using content::WebUIMessageHandler;
33 34
34 namespace { 35 namespace {
35 36
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 cert_request_info, 314 cert_request_info,
314 delegate); 315 delegate);
315 else 316 else
316 ShowNativeSSLClientCertificateSelector(wrapper, 317 ShowNativeSSLClientCertificateSelector(wrapper,
317 cert_request_info, 318 cert_request_info,
318 delegate); 319 delegate);
319 #endif 320 #endif
320 } 321 }
321 322
322 } // namespace browser 323 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698