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

Side by Side Diff: services/sky/document_view.h

Issue 1230113006: Remove last use of Platform::networkService() (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « no previous file | services/sky/document_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 SERVICES_SKY_DOCUMENT_VIEW_H_ 5 #ifndef SERVICES_SKY_DOCUMENT_VIEW_H_
6 #define SERVICES_SKY_DOCUMENT_VIEW_H_ 6 #define SERVICES_SKY_DOCUMENT_VIEW_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.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/public/cpp/application/service_provider_impl.h" 11 #include "mojo/public/cpp/application/service_provider_impl.h"
12 #include "mojo/public/cpp/bindings/strong_binding.h" 12 #include "mojo/public/cpp/bindings/strong_binding.h"
13 #include "mojo/public/interfaces/application/application.mojom.h" 13 #include "mojo/public/interfaces/application/application.mojom.h"
14 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom. h" 14 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom. h"
15 #include "mojo/services/navigation/public/interfaces/navigation.mojom.h" 15 #include "mojo/services/navigation/public/interfaces/navigation.mojom.h"
16 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
16 #include "mojo/services/network/public/interfaces/url_loader.mojom.h" 17 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
17 #include "mojo/services/service_registry/public/interfaces/service_registry.mojo m.h" 18 #include "mojo/services/service_registry/public/interfaces/service_registry.mojo m.h"
18 #include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h" 19 #include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
19 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h" 20 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
20 #include "mojo/services/view_manager/public/cpp/view_observer.h" 21 #include "mojo/services/view_manager/public/cpp/view_observer.h"
21 #include "services/sky/compositor/layer_client.h" 22 #include "services/sky/compositor/layer_client.h"
22 #include "services/sky/compositor/layer_host_client.h" 23 #include "services/sky/compositor/layer_host_client.h"
23 #include "sky/engine/public/platform/ServiceProvider.h" 24 #include "sky/engine/public/platform/ServiceProvider.h"
24 #include "sky/engine/public/sky/sky_view.h" 25 #include "sky/engine/public/sky/sky_view.h"
25 #include "sky/engine/public/sky/sky_view_client.h" 26 #include "sky/engine/public/sky/sky_view_client.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 106
106 void UpdateRootSizeAndViewportMetrics(const mojo::Rect& new_bounds); 107 void UpdateRootSizeAndViewportMetrics(const mojo::Rect& new_bounds);
107 108
108 void InitServiceRegistry(); 109 void InitServiceRegistry();
109 110
110 mojo::URLResponsePtr response_; 111 mojo::URLResponsePtr response_;
111 mojo::ServiceProviderImpl exported_services_; 112 mojo::ServiceProviderImpl exported_services_;
112 mojo::ServiceProviderPtr imported_services_; 113 mojo::ServiceProviderPtr imported_services_;
113 mojo::InterfaceRequest<mojo::ServiceProvider> services_provided_to_embedder_; 114 mojo::InterfaceRequest<mojo::ServiceProvider> services_provided_to_embedder_;
114 mojo::ServiceProviderPtr services_provided_by_embedder_; 115 mojo::ServiceProviderPtr services_provided_by_embedder_;
116 mojo::NetworkServicePtr network_service_;
115 mojo::Shell* shell_; 117 mojo::Shell* shell_;
116 mojo::NavigatorHostPtr navigator_host_; 118 mojo::NavigatorHostPtr navigator_host_;
117 std::unique_ptr<blink::SkyView> sky_view_; 119 std::unique_ptr<blink::SkyView> sky_view_;
118 mojo::View* root_; 120 mojo::View* root_;
119 mojo::ViewManagerClientFactory view_manager_client_factory_; 121 mojo::ViewManagerClientFactory view_manager_client_factory_;
120 scoped_ptr<DartLibraryProviderImpl> library_provider_; 122 scoped_ptr<DartLibraryProviderImpl> library_provider_;
121 scoped_ptr<LayerHost> layer_host_; 123 scoped_ptr<LayerHost> layer_host_;
122 scoped_refptr<Layer> root_layer_; 124 scoped_refptr<Layer> root_layer_;
123 RasterizerBitmap* bitmap_rasterizer_; // Used for pixel tests. 125 RasterizerBitmap* bitmap_rasterizer_; // Used for pixel tests.
124 mojo::ServiceRegistryPtr service_registry_; 126 mojo::ServiceRegistryPtr service_registry_;
125 scoped_ptr<mojo::StrongBinding<mojo::ServiceProvider>> 127 scoped_ptr<mojo::StrongBinding<mojo::ServiceProvider>>
126 service_registry_service_provider_binding_; 128 service_registry_service_provider_binding_;
127 129
128 base::WeakPtrFactory<DocumentView> weak_factory_; 130 base::WeakPtrFactory<DocumentView> weak_factory_;
129 131
130 DISALLOW_COPY_AND_ASSIGN(DocumentView); 132 DISALLOW_COPY_AND_ASSIGN(DocumentView);
131 }; 133 };
132 134
133 } // namespace sky 135 } // namespace sky
134 136
135 #endif // SERVICES_SKY_DOCUMENT_VIEW_H_ 137 #endif // SERVICES_SKY_DOCUMENT_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | services/sky/document_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698