chrome/test/data/webui/certificate_viewer_ui_test-inl.h - Issue 9003014: Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h inst...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 9003014: Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h inst... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' 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

« no previous file with comments | « chrome/test/base/test_html_dialog_observer.cc ('k') | chrome/test/data/webui/edit_search_engine_dialog_browsertest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/browser.h"	5 #include "chrome/browser/ui/browser.h"

6 #include "chrome/browser/ui/browser_window.h"	6 #include "chrome/browser/ui/browser_window.h"

7 #include "chrome/browser/ui/webui/chrome_web_ui.h"	7 #include "chrome/browser/ui/webui/chrome_web_ui.h"

8 #include "chrome/browser/ui/webui/web_ui_browsertest.h"	8 #include "chrome/browser/ui/webui/web_ui_browsertest.h"

9 #include "chrome/browser/certificate_viewer.h"	9 #include "chrome/browser/certificate_viewer.h"

10 #include "chrome/common/url_constants.h"	10 #include "chrome/common/url_constants.h"

(...skipping 22 matching lines...) Expand all Loading...
33 scoped_refptr<net::X509Certificate> google_cert(	33 scoped_refptr<net::X509Certificate> google_cert(

34 net::X509Certificate::CreateFromBytes(	34 net::X509Certificate::CreateFromBytes(

35 reinterpret_cast<const char*>(google_der), sizeof(google_der)));	35 reinterpret_cast<const char*>(google_der), sizeof(google_der)));

36	36

37 ASSERT_TRUE(browser());	37 ASSERT_TRUE(browser());

38 ASSERT_TRUE(browser()->window());	38 ASSERT_TRUE(browser()->window());

39	39

40 TestHtmlDialogObserver dialog_observer(this);	40 TestHtmlDialogObserver dialog_observer(this);

41 ::ShowCertificateViewer(browser()->window()->GetNativeHandle(), google_cert);	41 ::ShowCertificateViewer(browser()->window()->GetNativeHandle(), google_cert);

42 WebUI* webui = dialog_observer.GetWebUI();	42 WebUI* webui = dialog_observer.GetWebUI();

43 webui->tab_contents()->GetRenderViewHost()->SetWebUIProperty(	43 webui->web_contents()->GetRenderViewHost()->SetWebUIProperty(

44 "expectedUrl", chrome::kChromeUICertificateViewerURL);	44 "expectedUrl", chrome::kChromeUICertificateViewerURL);

45 SetWebUIInstance(webui);	45 SetWebUIInstance(webui);

46 WebUIBrowserTest::SetUpOnMainThread();	46 WebUIBrowserTest::SetUpOnMainThread();

47 }	47 }

OLD	NEW