Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / ssl_client_certificate_selector.cc

diff --git a/src/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/src/chrome/browser/ui/views/ssl_client_certificate_selector.cc
index 56830e9..969de17 100644 (file)
--- a/src/chrome/browser/ui/views/ssl_client_certificate_selector.cc
+++ b/src/chrome/browser/ui/views/ssl_client_certificate_selector.cc
@@ -8,8 +8,8 @@
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
-#include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/constrained_window/constrained_window_views.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "net/cert/x509_certificate.h"
@@ -38,9 +38,9 @@ class CertificateSelectorTableModel : public ui::TableModel {
       net::SSLCertRequestInfo* cert_request_info);
 
   // ui::TableModel implementation:
-  virtual int RowCount() OVERRIDE;
-  virtual base::string16 GetText(int index, int column_id) OVERRIDE;
-  virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE;
+  int RowCount() override;
+  base::string16 GetText(int index, int column_id) override;
+  void SetObserver(ui::TableModelObserver* observer) override;
 
  private:
   std::vector<base::string16> items_;
@@ -82,10 +82,10 @@ void CertificateSelectorTableModel::SetObserver(
 
 SSLClientCertificateSelector::SSLClientCertificateSelector(
     content::WebContents* web_contents,
-    const net::HttpNetworkSession* network_session,
     const scoped_refptr<net::SSLCertRequestInfo>& cert_request_info,
     const chrome::SelectCertificateCallback& callback)
-    : SSLClientAuthObserver(network_session, cert_request_info, callback),
+    : SSLClientAuthObserver(web_contents->GetBrowserContext(),
+                            cert_request_info, callback),
       model_(new CertificateSelectorTableModel(cert_request_info.get())),
       web_contents_(web_contents),
       table_(NULL),
@@ -274,13 +274,12 @@ namespace chrome {
 
 void ShowSSLClientCertificateSelector(
     content::WebContents* contents,
-    const net::HttpNetworkSession* network_session,
     net::SSLCertRequestInfo* cert_request_info,
     const chrome::SelectCertificateCallback& callback) {
   DVLOG(1) << __FUNCTION__ << " " << contents;
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   (new SSLClientCertificateSelector(
-       contents, network_session, cert_request_info, callback))->Init();
+       contents, cert_request_info, callback))->Init();
 }
 
 }  // namespace chrome