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

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

Issue 981143005: Fix build: ServiceRegisty's Mojo module changed. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 9 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 | no next file » | 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 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/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"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 mojo::ServiceProviderPtr services_provided_by_embedder_; 134 mojo::ServiceProviderPtr services_provided_by_embedder_;
135 mojo::Shell* shell_; 135 mojo::Shell* shell_;
136 TestHarnessPtr test_harness_; 136 TestHarnessPtr test_harness_;
137 mojo::NavigatorHostPtr navigator_host_; 137 mojo::NavigatorHostPtr navigator_host_;
138 blink::WebView* web_view_; 138 blink::WebView* web_view_;
139 mojo::View* root_; 139 mojo::View* root_;
140 mojo::ViewManagerClientFactory view_manager_client_factory_; 140 mojo::ViewManagerClientFactory view_manager_client_factory_;
141 scoped_ptr<LayerHost> layer_host_; 141 scoped_ptr<LayerHost> layer_host_;
142 scoped_refptr<Layer> root_layer_; 142 scoped_refptr<Layer> root_layer_;
143 RasterizerBitmap* bitmap_rasterizer_; // Used for pixel tests. 143 RasterizerBitmap* bitmap_rasterizer_; // Used for pixel tests.
144 service_registry::ServiceRegistryPtr service_registry_; 144 mojo::ServiceRegistryPtr service_registry_;
145 scoped_ptr<mojo::StrongBinding<mojo::ServiceProvider>> 145 scoped_ptr<mojo::StrongBinding<mojo::ServiceProvider>>
146 service_registry_service_provider_binding_; 146 service_registry_service_provider_binding_;
147 base::WeakPtrFactory<DocumentView> weak_factory_; 147 base::WeakPtrFactory<DocumentView> weak_factory_;
148 148
149 DISALLOW_COPY_AND_ASSIGN(DocumentView); 149 DISALLOW_COPY_AND_ASSIGN(DocumentView);
150 }; 150 };
151 151
152 } // namespace sky 152 } // namespace sky
153 153
154 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_ 154 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698