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

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

Issue 12089051: Revert 179271 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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/data/webui/async_gen.h ('k') | chrome/test/data/webui/chrome_send_browsertest.h » ('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/browser/ui/webui/web_ui_browsertest.h"
10 #include "chrome/common/url_constants.h" 11 #include "chrome/common/url_constants.h"
11 #include "chrome/test/base/ui_test_utils.h" 12 #include "chrome/test/base/ui_test_utils.h"
12 #include "chrome/test/base/web_ui_browsertest.h"
13 #include "content/public/browser/render_view_host.h" 13 #include "content/public/browser/render_view_host.h"
14 #include "content/public/browser/web_contents.h" 14 #include "content/public/browser/web_contents.h"
15 #include "content/public/browser/web_ui.h" 15 #include "content/public/browser/web_ui.h"
16 #include "net/base/test_certificate_data.h" 16 #include "net/base/test_certificate_data.h"
17 #include "net/base/x509_certificate.h" 17 #include "net/base/x509_certificate.h"
18 #include "ui/web_dialogs/test/test_web_dialog_observer.h" 18 #include "ui/web_dialogs/test/test_web_dialog_observer.h"
19 19
20 // Test framework for chrome/test/data/webui/certificate_viewer_dialog_test.js. 20 // Test framework for chrome/test/data/webui/certificate_viewer_dialog_test.js.
21 class CertificateViewerUITest : public WebUIBrowserTest { 21 class CertificateViewerUITest : public WebUIBrowserTest {
22 public: 22 public:
(...skipping 17 matching lines...) Expand all
40 google_cert); 40 google_cert);
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/test/data/webui/async_gen.h ('k') | chrome/test/data/webui/chrome_send_browsertest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698