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" |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 blink::WebLocalFrame*, | 82 blink::WebLocalFrame*, |
83 v8::Handle<v8::Context>, | 83 v8::Handle<v8::Context>, |
84 int extensionGroup, | 84 int extensionGroup, |
85 int worldId) override; | 85 int worldId) override; |
86 | 86 |
87 // WebViewClient methods: | 87 // WebViewClient methods: |
88 blink::ServiceProvider& services() override; | 88 blink::ServiceProvider& services() override; |
89 | 89 |
90 // Services methods: | 90 // Services methods: |
91 mojo::NavigatorHost* NavigatorHost() override; | 91 mojo::NavigatorHost* NavigatorHost() override; |
| 92 mojo::Shell* Shell() override; |
92 | 93 |
93 // ViewManagerDelegate methods: | 94 // ViewManagerDelegate methods: |
94 void OnEmbed( | 95 void OnEmbed( |
95 mojo::ViewManager* view_manager, | 96 mojo::ViewManager* view_manager, |
96 mojo::View* root, | 97 mojo::View* root, |
97 mojo::ServiceProviderImpl* exported_services, | 98 mojo::ServiceProviderImpl* exported_services, |
98 scoped_ptr<mojo::ServiceProvider> imported_services) override; | 99 scoped_ptr<mojo::ServiceProvider> imported_services) override; |
99 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override; | 100 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override; |
100 | 101 |
101 // ViewObserver methods: | 102 // ViewObserver methods: |
(...skipping 12 matching lines...) Expand all Loading... |
114 scoped_ptr<mojo::ServiceProvider> imported_services_; | 115 scoped_ptr<mojo::ServiceProvider> imported_services_; |
115 mojo::ShellPtr shell_; | 116 mojo::ShellPtr shell_; |
116 mojo::LazyInterfacePtr<mojo::NavigatorHost> navigator_host_; | 117 mojo::LazyInterfacePtr<mojo::NavigatorHost> navigator_host_; |
117 blink::WebView* web_view_; | 118 blink::WebView* web_view_; |
118 mojo::View* root_; | 119 mojo::View* root_; |
119 mojo::ViewManagerClientFactory view_manager_client_factory_; | 120 mojo::ViewManagerClientFactory view_manager_client_factory_; |
120 InspectorServiceFactory inspector_service_factory_; | 121 InspectorServiceFactory inspector_service_factory_; |
121 scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_; | 122 scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_; |
122 scoped_refptr<base::MessageLoopProxy> compositor_thread_; | 123 scoped_refptr<base::MessageLoopProxy> compositor_thread_; |
123 scoped_ptr<ScriptRunner> script_runner_; | 124 scoped_ptr<ScriptRunner> script_runner_; |
| 125 int debugger_id_; |
124 | 126 |
125 base::WeakPtrFactory<DocumentView> weak_factory_; | 127 base::WeakPtrFactory<DocumentView> weak_factory_; |
126 DISALLOW_COPY_AND_ASSIGN(DocumentView); | 128 DISALLOW_COPY_AND_ASSIGN(DocumentView); |
127 }; | 129 }; |
128 | 130 |
129 } // namespace sky | 131 } // namespace sky |
130 | 132 |
131 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_ | 133 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_ |
OLD | NEW |