| OLD | NEW |
| 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/certificate_viewer.h" | 5 #include "chrome/browser/certificate_viewer.h" |
| 6 #include "chrome/browser/ui/browser.h" | 6 #include "chrome/browser/ui/browser.h" |
| 7 #include "chrome/browser/ui/browser_window.h" | 7 #include "chrome/browser/ui/browser_window.h" |
| 8 #include "chrome/browser/ui/webui/certificate_viewer_webui.h" | 8 #include "chrome/browser/ui/webui/certificate_viewer_webui.h" |
| 9 #include "chrome/browser/ui/webui/web_ui_browsertest.h" | 9 #include "chrome/browser/ui/webui/web_ui_browsertest.h" |
| 10 #include "chrome/common/url_constants.h" | 10 #include "chrome/common/url_constants.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 net::X509Certificate::CreateFromBytes( | 31 net::X509Certificate::CreateFromBytes( |
| 32 reinterpret_cast<const char*>(google_der), sizeof(google_der))); | 32 reinterpret_cast<const char*>(google_der), sizeof(google_der))); |
| 33 | 33 |
| 34 ASSERT_TRUE(browser()); | 34 ASSERT_TRUE(browser()); |
| 35 ASSERT_TRUE(browser()->window()); | 35 ASSERT_TRUE(browser()->window()); |
| 36 | 36 |
| 37 TestWebDialogObserver dialog_observer(this); | 37 TestWebDialogObserver dialog_observer(this); |
| 38 CertificateViewerDialog* dialog = new CertificateViewerDialog( | 38 CertificateViewerDialog* dialog = new CertificateViewerDialog( |
| 39 google_cert); | 39 google_cert); |
| 40 dialog->AddObserver(&dialog_observer); | 40 dialog->AddObserver(&dialog_observer); |
| 41 dialog->Show(browser()->window()->GetNativeHandle()); | 41 dialog->Show(browser()->window()->GetNativeWindow()); |
| 42 dialog->RemoveObserver(&dialog_observer); | 42 dialog->RemoveObserver(&dialog_observer); |
| 43 content::WebUI* webui = dialog_observer.GetWebUI(); | 43 content::WebUI* webui = dialog_observer.GetWebUI(); |
| 44 webui->GetWebContents()->GetRenderViewHost()->SetWebUIProperty( | 44 webui->GetWebContents()->GetRenderViewHost()->SetWebUIProperty( |
| 45 "expectedUrl", chrome::kChromeUICertificateViewerURL); | 45 "expectedUrl", chrome::kChromeUICertificateViewerURL); |
| 46 SetWebUIInstance(webui); | 46 SetWebUIInstance(webui); |
| 47 } | 47 } |
| OLD | NEW |