| 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_WEB_VIEW__TEST_RUNNER_TEST_RUNNER_APPLICATION_DELEGATE_H_ | 5 #ifndef COMPONENTS_WEB_VIEW__TEST_RUNNER_TEST_RUNNER_APPLICATION_DELEGATE_H_ |
| 6 #define COMPONENTS_WEB_VIEW__TEST_RUNNER_TEST_RUNNER_APPLICATION_DELEGATE_H_ | 6 #define COMPONENTS_WEB_VIEW__TEST_RUNNER_TEST_RUNNER_APPLICATION_DELEGATE_H_ |
| 7 | 7 |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "components/mus/public/cpp/window_tree_delegate.h" | 10 #include "components/mus/public/cpp/window_tree_delegate.h" |
| 11 #include "components/mus/public/interfaces/view_tree_host.mojom.h" | 11 #include "components/mus/public/interfaces/window_tree_host.mojom.h" |
| 12 #include "components/test_runner/test_info_extractor.h" | 12 #include "components/test_runner/test_info_extractor.h" |
| 13 #include "components/web_view/public/cpp/web_view.h" | 13 #include "components/web_view/public/cpp/web_view.h" |
| 14 #include "components/web_view/public/interfaces/web_view.mojom.h" | 14 #include "components/web_view/public/interfaces/web_view.mojom.h" |
| 15 #include "components/web_view/test_runner/public/interfaces/layout_test_runner.m
ojom.h" | 15 #include "components/web_view/test_runner/public/interfaces/layout_test_runner.m
ojom.h" |
| 16 #include "mojo/application/public/cpp/application_delegate.h" | 16 #include "mojo/application/public/cpp/application_delegate.h" |
| 17 #include "mojo/application/public/cpp/interface_factory.h" | 17 #include "mojo/application/public/cpp/interface_factory.h" |
| 18 #include "mojo/common/weak_binding_set.h" | 18 #include "mojo/common/weak_binding_set.h" |
| 19 | 19 |
| 20 class GURL; | 20 class GURL; |
| 21 | 21 |
| 22 namespace mojo { | |
| 23 class View; | |
| 24 } | |
| 25 | |
| 26 namespace web_view { | 22 namespace web_view { |
| 27 | 23 |
| 28 class TestRunnerApplicationDelegate | 24 class TestRunnerApplicationDelegate |
| 29 : public mojo::ApplicationDelegate, | 25 : public mojo::ApplicationDelegate, |
| 30 public mus::WindowTreeDelegate, | 26 public mus::WindowTreeDelegate, |
| 31 public mojom::WebViewClient, | 27 public mojom::WebViewClient, |
| 32 public LayoutTestRunner, | 28 public LayoutTestRunner, |
| 33 public mojo::InterfaceFactory<LayoutTestRunner> { | 29 public mojo::InterfaceFactory<LayoutTestRunner> { |
| 34 public: | 30 public: |
| 35 TestRunnerApplicationDelegate(); | 31 TestRunnerApplicationDelegate(); |
| (...skipping 26 matching lines...) Expand all Loading... |
| 62 int32_t active_match_ordinal) override {} | 58 int32_t active_match_ordinal) override {} |
| 63 | 59 |
| 64 // LayoutTestRunner: | 60 // LayoutTestRunner: |
| 65 void TestFinished() override; | 61 void TestFinished() override; |
| 66 | 62 |
| 67 // mojo::InterfaceFactory<LayoutTestRunner>: | 63 // mojo::InterfaceFactory<LayoutTestRunner>: |
| 68 void Create(mojo::ApplicationConnection* connection, | 64 void Create(mojo::ApplicationConnection* connection, |
| 69 mojo::InterfaceRequest<LayoutTestRunner> request) override; | 65 mojo::InterfaceRequest<LayoutTestRunner> request) override; |
| 70 | 66 |
| 71 mojo::ApplicationImpl* app_; | 67 mojo::ApplicationImpl* app_; |
| 72 mojo::ViewTreeHostPtr host_; | 68 mus::mojom::WindowTreeHostPtr host_; |
| 73 | 69 |
| 74 mus::Window* root_; | 70 mus::Window* root_; |
| 75 mus::Window* content_; | 71 mus::Window* content_; |
| 76 scoped_ptr<WebView> web_view_; | 72 scoped_ptr<WebView> web_view_; |
| 77 | 73 |
| 78 scoped_ptr<test_runner::TestInfoExtractor> test_extractor_; | 74 scoped_ptr<test_runner::TestInfoExtractor> test_extractor_; |
| 79 | 75 |
| 80 mojo::WeakBindingSet<LayoutTestRunner> layout_test_runner_; | 76 mojo::WeakBindingSet<LayoutTestRunner> layout_test_runner_; |
| 81 | 77 |
| 82 DISALLOW_COPY_AND_ASSIGN(TestRunnerApplicationDelegate); | 78 DISALLOW_COPY_AND_ASSIGN(TestRunnerApplicationDelegate); |
| 83 }; | 79 }; |
| 84 | 80 |
| 85 } // namespace web_view | 81 } // namespace web_view |
| 86 | 82 |
| 87 #endif // COMPONENTS_WEB_VIEW__TEST_RUNNER_TEST_RUNNER_APPLICATION_DELEGATE_H_ | 83 #endif // COMPONENTS_WEB_VIEW__TEST_RUNNER_TEST_RUNNER_APPLICATION_DELEGATE_H_ |
| OLD | NEW |