| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 SKY_VIEWER_DOCUMENT_VIEW_H_ | 5 #ifndef SKY_VIEWER_DOCUMENT_VIEW_H_ |
| 6 #define SKY_VIEWER_DOCUMENT_VIEW_H_ | 6 #define SKY_VIEWER_DOCUMENT_VIEW_H_ |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "mojo/public/cpp/application/lazy_interface_ptr.h" | 10 #include "mojo/public/cpp/application/lazy_interface_ptr.h" |
| 11 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" | 11 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" |
| 12 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" | 12 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" |
| 13 #include "mojo/services/public/cpp/view_manager/view_observer.h" | 13 #include "mojo/services/public/cpp/view_manager/view_observer.h" |
| 14 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom.
h" | 14 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom.
h" |
| 15 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h" | 15 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h" |
| 16 #include "mojo/services/public/interfaces/network/url_loader.mojom.h" | 16 #include "mojo/services/public/interfaces/network/url_loader.mojom.h" |
| 17 #include "sky/engine/public/web/WebFrameClient.h" | 17 #include "sky/engine/public/web/WebFrameClient.h" |
| 18 #include "sky/engine/public/web/WebViewClient.h" | 18 #include "sky/engine/public/web/WebViewClient.h" |
| 19 #include "sky/viewer/services/inspector_impl.h" |
| 19 | 20 |
| 20 namespace base { | 21 namespace base { |
| 21 class MessageLoopProxy; | 22 class MessageLoopProxy; |
| 22 } | 23 } |
| 23 | 24 |
| 24 namespace mojo { | 25 namespace mojo { |
| 25 class ViewManager; | 26 class ViewManager; |
| 26 class View; | 27 class View; |
| 27 } | 28 } |
| 28 | 29 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 | 92 |
| 92 void Load(mojo::URLResponsePtr response); | 93 void Load(mojo::URLResponsePtr response); |
| 93 | 94 |
| 94 mojo::URLResponsePtr response_; | 95 mojo::URLResponsePtr response_; |
| 95 scoped_ptr<mojo::ServiceProvider> imported_services_; | 96 scoped_ptr<mojo::ServiceProvider> imported_services_; |
| 96 mojo::Shell* shell_; | 97 mojo::Shell* shell_; |
| 97 mojo::LazyInterfacePtr<mojo::NavigatorHost> navigator_host_; | 98 mojo::LazyInterfacePtr<mojo::NavigatorHost> navigator_host_; |
| 98 blink::WebView* web_view_; | 99 blink::WebView* web_view_; |
| 99 mojo::View* root_; | 100 mojo::View* root_; |
| 100 mojo::ViewManagerClientFactory view_manager_client_factory_; | 101 mojo::ViewManagerClientFactory view_manager_client_factory_; |
| 102 InspectorServiceFactory inspector_service_factory_; |
| 101 scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_; | 103 scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_; |
| 102 scoped_refptr<base::MessageLoopProxy> compositor_thread_; | 104 scoped_refptr<base::MessageLoopProxy> compositor_thread_; |
| 103 scoped_ptr<ScriptRunner> script_runner_; | 105 scoped_ptr<ScriptRunner> script_runner_; |
| 104 | 106 |
| 105 base::WeakPtrFactory<DocumentView> weak_factory_; | 107 base::WeakPtrFactory<DocumentView> weak_factory_; |
| 106 DISALLOW_COPY_AND_ASSIGN(DocumentView); | 108 DISALLOW_COPY_AND_ASSIGN(DocumentView); |
| 107 }; | 109 }; |
| 108 | 110 |
| 109 } // namespace sky | 111 } // namespace sky |
| 110 | 112 |
| 111 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_ | 113 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_ |
| OLD | NEW |