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

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

Issue 869753002: Update {virtual,override,final} to follow C++11 style in chrome, round 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix format Created 5 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
« no previous file with comments | « chrome/test/base/view_event_test_platform_part_chromeos.cc ('k') | no next file » | 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/constrained_web_dialog_ui.h" 10 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
11 #include "chrome/common/url_constants.h" 11 #include "chrome/common/url_constants.h"
12 #include "chrome/test/base/ui_test_utils.h" 12 #include "chrome/test/base/ui_test_utils.h"
13 #include "chrome/test/base/web_ui_browser_test.h" 13 #include "chrome/test/base/web_ui_browser_test.h"
14 #include "content/public/browser/render_view_host.h" 14 #include "content/public/browser/render_view_host.h"
15 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
16 #include "content/public/browser/web_ui.h" 16 #include "content/public/browser/web_ui.h"
17 #include "content/public/test/browser_test_utils.h" 17 #include "content/public/test/browser_test_utils.h"
18 #include "net/cert/x509_certificate.h" 18 #include "net/cert/x509_certificate.h"
19 #include "net/test/test_certificate_data.h" 19 #include "net/test/test_certificate_data.h"
20 20
21 // Test framework for chrome/test/data/webui/certificate_viewer_dialog_test.js. 21 // Test framework for chrome/test/data/webui/certificate_viewer_dialog_test.js.
22 class CertificateViewerUITest : public WebUIBrowserTest { 22 class CertificateViewerUITest : public WebUIBrowserTest {
23 public: 23 public:
24 CertificateViewerUITest(); 24 CertificateViewerUITest();
25 virtual ~CertificateViewerUITest(); 25 ~CertificateViewerUITest() override;
26 26
27 protected: 27 protected:
28 void CreateCertViewerDialog(); 28 void CreateCertViewerDialog();
29 void ShowCertificateViewer(); 29 void ShowCertificateViewer();
30 #if defined(OS_CHROMEOS) 30 #if defined(OS_CHROMEOS)
31 void ShowModalCertificateViewer(); 31 void ShowModalCertificateViewer();
32 #endif 32 #endif
33 }; 33 };
34 34
35 35
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 browser()->window()->GetNativeWindow()); 73 browser()->window()->GetNativeWindow());
74 content::WebContents* webui_webcontents = 74 content::WebContents* webui_webcontents =
75 dialog->GetWebUI()->GetWebContents(); 75 dialog->GetWebUI()->GetWebContents();
76 content::WaitForLoadStop(webui_webcontents); 76 content::WaitForLoadStop(webui_webcontents);
77 content::WebUI* webui = webui_webcontents->GetWebUI(); 77 content::WebUI* webui = webui_webcontents->GetWebUI();
78 webui_webcontents->GetRenderViewHost()->SetWebUIProperty( 78 webui_webcontents->GetRenderViewHost()->SetWebUIProperty(
79 "expectedUrl", chrome::kChromeUICertificateViewerDialogURL); 79 "expectedUrl", chrome::kChromeUICertificateViewerDialogURL);
80 SetWebUIInstance(webui); 80 SetWebUIInstance(webui);
81 } 81 }
82 #endif 82 #endif
OLDNEW
« no previous file with comments | « chrome/test/base/view_event_test_platform_part_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698