| 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/view_tree_delegate.h" | 10 #include "components/mus/public/cpp/view_tree_delegate.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 // mojo::ApplicationDelegate: | 42 // mojo::ApplicationDelegate: |
| 43 void Initialize(mojo::ApplicationImpl* app) override; | 43 void Initialize(mojo::ApplicationImpl* app) override; |
| 44 bool ConfigureIncomingConnection( | 44 bool ConfigureIncomingConnection( |
| 45 mojo::ApplicationConnection* connection) override; | 45 mojo::ApplicationConnection* connection) override; |
| 46 | 46 |
| 47 // mus::ViewTreeDelegate: | 47 // mus::ViewTreeDelegate: |
| 48 void OnEmbed(mus::View* root) override; | 48 void OnEmbed(mus::View* root) override; |
| 49 void OnConnectionLost(mus::ViewTreeConnection* connection) override; | 49 void OnConnectionLost(mus::ViewTreeConnection* connection) override; |
| 50 | 50 |
| 51 // mojom::WebViewClient: | 51 // mojom::WebViewClient: |
| 52 void TopLevelNavigate(mojo::URLRequestPtr request) override; | 52 void TopLevelNavigateRequest(mojo::URLRequestPtr request) override; |
| 53 void TopLevelNavigationStarted(const mojo::String& url) override; |
| 53 void LoadingStateChanged(bool is_loading, double progress) override; | 54 void LoadingStateChanged(bool is_loading, double progress) override; |
| 54 void BackForwardChanged(mojom::ButtonState back_button, | 55 void BackForwardChanged(mojom::ButtonState back_button, |
| 55 mojom::ButtonState forward_button) override; | 56 mojom::ButtonState forward_button) override; |
| 56 void TitleChanged(const mojo::String& title) override; | 57 void TitleChanged(const mojo::String& title) override; |
| 57 | 58 |
| 58 // LayoutTestRunner: | 59 // LayoutTestRunner: |
| 59 void TestFinished() override; | 60 void TestFinished() override; |
| 60 | 61 |
| 61 // mojo::InterfaceFactory<LayoutTestRunner>: | 62 // mojo::InterfaceFactory<LayoutTestRunner>: |
| 62 void Create(mojo::ApplicationConnection* connection, | 63 void Create(mojo::ApplicationConnection* connection, |
| 63 mojo::InterfaceRequest<LayoutTestRunner> request) override; | 64 mojo::InterfaceRequest<LayoutTestRunner> request) override; |
| 64 | 65 |
| 65 mojo::ApplicationImpl* app_; | 66 mojo::ApplicationImpl* app_; |
| 66 mojo::ViewTreeHostPtr host_; | 67 mojo::ViewTreeHostPtr host_; |
| 67 | 68 |
| 68 mus::View* root_; | 69 mus::View* root_; |
| 69 mus::View* content_; | 70 mus::View* content_; |
| 70 scoped_ptr<WebView> web_view_; | 71 scoped_ptr<WebView> web_view_; |
| 71 | 72 |
| 72 scoped_ptr<test_runner::TestInfoExtractor> test_extractor_; | 73 scoped_ptr<test_runner::TestInfoExtractor> test_extractor_; |
| 73 | 74 |
| 74 mojo::WeakBindingSet<LayoutTestRunner> layout_test_runner_; | 75 mojo::WeakBindingSet<LayoutTestRunner> layout_test_runner_; |
| 75 | 76 |
| 76 DISALLOW_COPY_AND_ASSIGN(TestRunnerApplicationDelegate); | 77 DISALLOW_COPY_AND_ASSIGN(TestRunnerApplicationDelegate); |
| 77 }; | 78 }; |
| 78 | 79 |
| 79 } // namespace web_view | 80 } // namespace web_view |
| 80 | 81 |
| 81 #endif // COMPONENTS_WEB_VIEW__TEST_RUNNER_TEST_RUNNER_APPLICATION_DELEGATE_H_ | 82 #endif // COMPONENTS_WEB_VIEW__TEST_RUNNER_TEST_RUNNER_APPLICATION_DELEGATE_H_ |
| OLD | NEW |