| 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/test_runner/test_info_extractor.h" |
| 10 #include "components/view_manager/public/cpp/view_tree_delegate.h" | 11 #include "components/view_manager/public/cpp/view_tree_delegate.h" |
| 11 #include "components/view_manager/public/interfaces/view_tree_host.mojom.h" | 12 #include "components/view_manager/public/interfaces/view_tree_host.mojom.h" |
| 12 #include "components/web_view/public/cpp/web_view.h" | 13 #include "components/web_view/public/cpp/web_view.h" |
| 13 #include "components/web_view/public/interfaces/web_view.mojom.h" | 14 #include "components/web_view/public/interfaces/web_view.mojom.h" |
| 14 #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" |
| 15 #include "mojo/application/public/cpp/application_delegate.h" | 16 #include "mojo/application/public/cpp/application_delegate.h" |
| 16 #include "mojo/application/public/cpp/interface_factory.h" | 17 #include "mojo/application/public/cpp/interface_factory.h" |
| 17 #include "mojo/common/weak_binding_set.h" | 18 #include "mojo/common/weak_binding_set.h" |
| 18 | 19 |
| 19 class GURL; | 20 class GURL; |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 void Create(mojo::ApplicationConnection* connection, | 61 void Create(mojo::ApplicationConnection* connection, |
| 61 mojo::InterfaceRequest<LayoutTestRunner> request) override; | 62 mojo::InterfaceRequest<LayoutTestRunner> request) override; |
| 62 | 63 |
| 63 mojo::ApplicationImpl* app_; | 64 mojo::ApplicationImpl* app_; |
| 64 mojo::ViewTreeHostPtr host_; | 65 mojo::ViewTreeHostPtr host_; |
| 65 | 66 |
| 66 mojo::View* root_; | 67 mojo::View* root_; |
| 67 mojo::View* content_; | 68 mojo::View* content_; |
| 68 scoped_ptr<WebView> web_view_; | 69 scoped_ptr<WebView> web_view_; |
| 69 | 70 |
| 70 base::CommandLine::StringVector cmdline_args_; | 71 scoped_ptr<test_runner::TestInfoExtractor> test_extractor_; |
| 71 size_t cmdline_position_; | |
| 72 | 72 |
| 73 mojo::WeakBindingSet<LayoutTestRunner> layout_test_runner_; | 73 mojo::WeakBindingSet<LayoutTestRunner> layout_test_runner_; |
| 74 | 74 |
| 75 DISALLOW_COPY_AND_ASSIGN(TestRunnerApplicationDelegate); | 75 DISALLOW_COPY_AND_ASSIGN(TestRunnerApplicationDelegate); |
| 76 }; | 76 }; |
| 77 | 77 |
| 78 } // namespace web_view | 78 } // namespace web_view |
| 79 | 79 |
| 80 #endif // COMPONENTS_WEB_VIEW__TEST_RUNNER_TEST_RUNNER_APPLICATION_DELEGATE_H_ | 80 #endif // COMPONENTS_WEB_VIEW__TEST_RUNNER_TEST_RUNNER_APPLICATION_DELEGATE_H_ |
| OLD | NEW |