OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #ifndef COMPONENTS_HTML_VIEWER_LAYOUT_TEST_HTML_VIEWER_H_ | 5 #ifndef COMPONENTS_HTML_VIEWER_LAYOUT_TEST_HTML_VIEWER_H_ |
6 #define COMPONENTS_HTML_VIEWER_LAYOUT_TEST_HTML_VIEWER_H_ | 6 #define COMPONENTS_HTML_VIEWER_LAYOUT_TEST_HTML_VIEWER_H_ |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "components/html_viewer/html_viewer.h" | 10 #include "components/html_viewer/html_viewer.h" |
11 #include "components/html_viewer/web_test_delegate_impl.h" | 11 #include "components/html_viewer/web_test_delegate_impl.h" |
12 | 12 |
13 namespace test_runner { | 13 namespace test_runner { |
14 class WebTestInterfaces; | 14 class WebTestInterfaces; |
15 } | 15 } |
16 | 16 |
17 namespace html_viewer { | 17 namespace html_viewer { |
18 | 18 |
19 class LayoutTestHTMLViewer : public HTMLViewer { | 19 class LayoutTestHTMLViewer : public HTMLViewer { |
20 public: | 20 public: |
21 LayoutTestHTMLViewer(); | 21 LayoutTestHTMLViewer(); |
22 ~LayoutTestHTMLViewer() override; | 22 ~LayoutTestHTMLViewer() override; |
23 | 23 |
24 private: | 24 private: |
25 void TestFinished(); | 25 void TestFinished(); |
26 | 26 |
27 // Overridden from ApplicationDelegate: | 27 // Overridden from ApplicationDelegate: |
28 void Initialize(mojo::ApplicationImpl* app) override; | 28 void Initialize(mojo::Shell* shell, const std::string& url, |
| 29 uint32_t id) override; |
29 | 30 |
30 // Overridden from InterfaceFactory<shell::mojom::ContentHandler> | 31 // Overridden from InterfaceFactory<shell::mojom::ContentHandler> |
31 void Create(mojo::ApplicationConnection* connection, | 32 void Create(mojo::ApplicationConnection* connection, |
32 mojo::InterfaceRequest<mojo::shell::mojom::ContentHandler> | 33 mojo::InterfaceRequest<mojo::shell::mojom::ContentHandler> |
33 request) override; | 34 request) override; |
34 | 35 |
35 scoped_ptr<test_runner::WebTestInterfaces> test_interfaces_; | 36 scoped_ptr<test_runner::WebTestInterfaces> test_interfaces_; |
36 WebTestDelegateImpl test_delegate_; | 37 WebTestDelegateImpl test_delegate_; |
37 | 38 |
38 DISALLOW_COPY_AND_ASSIGN(LayoutTestHTMLViewer); | 39 DISALLOW_COPY_AND_ASSIGN(LayoutTestHTMLViewer); |
39 }; | 40 }; |
40 | 41 |
41 } // namespace html_viewer | 42 } // namespace html_viewer |
42 | 43 |
43 #endif // COMPONENTS_HTML_VIEWER_LAYOUT_TEST_HTML_VIEWER_H_ | 44 #endif // COMPONENTS_HTML_VIEWER_LAYOUT_TEST_HTML_VIEWER_H_ |
OLD | NEW |