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

Side by Side Diff: chrome/test/data/webui/certificate_viewer_ui_test-inl.h

Issue 18308004: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 5 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
« no previous file with comments | « chrome/browser/ui/webui/help/help_handler.cc ('k') | chromeos/network/onc/onc_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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/tabs/tab_strip_model.h" 8 #include "chrome/browser/ui/tabs/tab_strip_model.h"
9 #include "chrome/browser/ui/webui/certificate_viewer_webui.h" 9 #include "chrome/browser/ui/webui/certificate_viewer_webui.h"
10 #include "chrome/common/url_constants.h" 10 #include "chrome/common/url_constants.h"
(...skipping 18 matching lines...) Expand all
29 29
30 void CertificateViewerUITest::ShowCertificateViewer() { 30 void CertificateViewerUITest::ShowCertificateViewer() {
31 scoped_refptr<net::X509Certificate> google_cert( 31 scoped_refptr<net::X509Certificate> google_cert(
32 net::X509Certificate::CreateFromBytes( 32 net::X509Certificate::CreateFromBytes(
33 reinterpret_cast<const char*>(google_der), sizeof(google_der))); 33 reinterpret_cast<const char*>(google_der), sizeof(google_der)));
34 34
35 ASSERT_TRUE(browser()); 35 ASSERT_TRUE(browser());
36 ASSERT_TRUE(browser()->window()); 36 ASSERT_TRUE(browser()->window());
37 37
38 ui::test::TestWebDialogObserver dialog_observer(this); 38 ui::test::TestWebDialogObserver dialog_observer(this);
39 CertificateViewerDialog* dialog = new CertificateViewerDialog( 39 CertificateViewerDialog* dialog =
40 google_cert); 40 new CertificateViewerDialog(google_cert.get());
41 dialog->AddObserver(&dialog_observer); 41 dialog->AddObserver(&dialog_observer);
42 dialog->Show(browser()->tab_strip_model()->GetActiveWebContents(), 42 dialog->Show(browser()->tab_strip_model()->GetActiveWebContents(),
43 browser()->window()->GetNativeWindow()); 43 browser()->window()->GetNativeWindow());
44 dialog->RemoveObserver(&dialog_observer); 44 dialog->RemoveObserver(&dialog_observer);
45 content::WebUI* webui = dialog_observer.GetWebUI(); 45 content::WebUI* webui = dialog_observer.GetWebUI();
46 webui->GetWebContents()->GetRenderViewHost()->SetWebUIProperty( 46 webui->GetWebContents()->GetRenderViewHost()->SetWebUIProperty(
47 "expectedUrl", chrome::kChromeUICertificateViewerURL); 47 "expectedUrl", chrome::kChromeUICertificateViewerURL);
48 SetWebUIInstance(webui); 48 SetWebUIInstance(webui);
49 } 49 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/help/help_handler.cc ('k') | chromeos/network/onc/onc_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698