Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

Side by Side Diff: components/html_viewer/html_document.h

Issue 1144153004: components: Remove use of MessageLoopProxy and deprecated MessageLoop APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_ 5 #ifndef COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
6 #define COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_ 6 #define COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 10 matching lines...) Expand all
21 #include "mojo/application/public/cpp/service_provider_impl.h" 21 #include "mojo/application/public/cpp/service_provider_impl.h"
22 #include "mojo/application/public/interfaces/application.mojom.h" 22 #include "mojo/application/public/interfaces/application.mojom.h"
23 #include "mojo/application/public/interfaces/content_handler.mojom.h" 23 #include "mojo/application/public/interfaces/content_handler.mojom.h"
24 #include "mojo/services/network/public/interfaces/url_loader.mojom.h" 24 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
25 #include "third_party/WebKit/public/web/WebFrameClient.h" 25 #include "third_party/WebKit/public/web/WebFrameClient.h"
26 #include "third_party/WebKit/public/web/WebSandboxFlags.h" 26 #include "third_party/WebKit/public/web/WebSandboxFlags.h"
27 #include "third_party/WebKit/public/web/WebViewClient.h" 27 #include "third_party/WebKit/public/web/WebViewClient.h"
28 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h" 28 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
29 29
30 namespace base { 30 namespace base {
31 class MessageLoopProxy; 31 class SingleThreadTaskRunner;
32 } 32 }
33 33
34 namespace mojo { 34 namespace mojo {
35 class ViewManager; 35 class ViewManager;
36 class View; 36 class View;
37 } 37 }
38 38
39 namespace html_viewer { 39 namespace html_viewer {
40 40
41 class AxProviderImpl; 41 class AxProviderImpl;
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 scoped_ptr<mojo::AppRefCount> app_refcount_; 129 scoped_ptr<mojo::AppRefCount> app_refcount_;
130 mojo::URLResponsePtr response_; 130 mojo::URLResponsePtr response_;
131 mojo::ServiceProviderImpl exported_services_; 131 mojo::ServiceProviderImpl exported_services_;
132 mojo::ServiceProviderPtr embedder_service_provider_; 132 mojo::ServiceProviderPtr embedder_service_provider_;
133 mojo::ShellPtr shell_; 133 mojo::ShellPtr shell_;
134 mojo::LazyInterfacePtr<mojo::NavigatorHost> navigator_host_; 134 mojo::LazyInterfacePtr<mojo::NavigatorHost> navigator_host_;
135 blink::WebView* web_view_; 135 blink::WebView* web_view_;
136 mojo::View* root_; 136 mojo::View* root_;
137 mojo::ViewManagerClientFactory view_manager_client_factory_; 137 mojo::ViewManagerClientFactory view_manager_client_factory_;
138 scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_; 138 scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_;
139 scoped_refptr<base::MessageLoopProxy> compositor_thread_; 139 scoped_refptr<base::SingleThreadTaskRunner> compositor_thread_;
140 140
141 // HTMLDocument owns these pointers; binding requests after document load. 141 // HTMLDocument owns these pointers; binding requests after document load.
142 std::set<mojo::InterfaceRequest<mojo::AxProvider>*> ax_provider_requests_; 142 std::set<mojo::InterfaceRequest<mojo::AxProvider>*> ax_provider_requests_;
143 std::set<AxProviderImpl*> ax_providers_; 143 std::set<AxProviderImpl*> ax_providers_;
144 144
145 // A flag set on didFinishLoad. 145 // A flag set on didFinishLoad.
146 bool did_finish_load_ = false; 146 bool did_finish_load_ = false;
147 147
148 Setup* setup_; 148 Setup* setup_;
149 149
150 scoped_ptr<TouchHandler> touch_handler_; 150 scoped_ptr<TouchHandler> touch_handler_;
151 151
152 DISALLOW_COPY_AND_ASSIGN(HTMLDocument); 152 DISALLOW_COPY_AND_ASSIGN(HTMLDocument);
153 }; 153 };
154 154
155 } // namespace html_viewer 155 } // namespace html_viewer
156 156
157 #endif // COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_ 157 #endif // COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
OLDNEW
« no previous file with comments | « components/history/core/test/history_backend_db_base_test.cc ('k') | components/html_viewer/html_document.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698