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_CONTENT_HANDLER_IMPL_H_ | 5 #ifndef COMPONENTS_HTML_VIEWER_LAYOUT_TEST_CONTENT_HANDLER_IMPL_H_ |
6 #define COMPONENTS_HTML_VIEWER_LAYOUT_TEST_CONTENT_HANDLER_IMPL_H_ | 6 #define COMPONENTS_HTML_VIEWER_LAYOUT_TEST_CONTENT_HANDLER_IMPL_H_ |
7 | 7 |
8 #include "components/html_viewer/content_handler_impl.h" | 8 #include "components/html_viewer/content_handler_impl.h" |
9 #include "components/html_viewer/html_factory.h" | 9 #include "components/html_viewer/html_factory.h" |
10 #include "components/test_runner/web_test_proxy.h" | 10 #include "components/test_runner/web_test_proxy.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 test_runner::WebTestInterfaces* test_interfaces, | 30 test_runner::WebTestInterfaces* test_interfaces, |
31 WebTestDelegateImpl* test_delegate); | 31 WebTestDelegateImpl* test_delegate); |
32 ~LayoutTestContentHandlerImpl() override; | 32 ~LayoutTestContentHandlerImpl() override; |
33 | 33 |
34 private: | 34 private: |
35 using WebWidgetProxy = | 35 using WebWidgetProxy = |
36 test_runner::WebTestProxy<HTMLWidgetRootLocal, | 36 test_runner::WebTestProxy<HTMLWidgetRootLocal, |
37 HTMLWidgetRootLocal::CreateParams*>; | 37 HTMLWidgetRootLocal::CreateParams*>; |
38 | 38 |
39 // ContentHandler: | 39 // ContentHandler: |
40 void StartApplication(mojo::InterfaceRequest<mojo::Application> request, | 40 void StartApplication( |
41 mojo::URLResponsePtr response) override; | 41 mojo::InterfaceRequest<mojo::Application> request, |
| 42 mojo::URLResponsePtr response, |
| 43 const mojo::Callback<void()>& destruct_callback) override; |
42 | 44 |
43 // HTMLFactory | 45 // HTMLFactory |
44 HTMLFrame* CreateHTMLFrame(HTMLFrame::CreateParams* params) override; | 46 HTMLFrame* CreateHTMLFrame(HTMLFrame::CreateParams* params) override; |
45 HTMLWidgetRootLocal* CreateHTMLWidgetRootLocal( | 47 HTMLWidgetRootLocal* CreateHTMLWidgetRootLocal( |
46 HTMLWidgetRootLocal::CreateParams* params) override; | 48 HTMLWidgetRootLocal::CreateParams* params) override; |
47 | 49 |
48 test_runner::WebTestInterfaces* test_interfaces_; | 50 test_runner::WebTestInterfaces* test_interfaces_; |
49 WebTestDelegateImpl* test_delegate_; | 51 WebTestDelegateImpl* test_delegate_; |
50 WebWidgetProxy* web_widget_proxy_; | 52 WebWidgetProxy* web_widget_proxy_; |
| 53 scoped_ptr<mojo::AppRefCount> app_refcount_; |
51 | 54 |
52 DISALLOW_COPY_AND_ASSIGN(LayoutTestContentHandlerImpl); | 55 DISALLOW_COPY_AND_ASSIGN(LayoutTestContentHandlerImpl); |
53 }; | 56 }; |
54 | 57 |
55 } // namespace html_viewer | 58 } // namespace html_viewer |
56 | 59 |
57 #endif // COMPONENTS_HTML_VIEWER_LAYOUT_TEST_CONTENT_HANDLER_IMPL_H_ | 60 #endif // COMPONENTS_HTML_VIEWER_LAYOUT_TEST_CONTENT_HANDLER_IMPL_H_ |
OLD | NEW |