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

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

Issue 968493004: Moved service_registry from services to mojo/services/service_registry (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 | « sky/viewer/BUILD.gn ('k') | 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"
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/interface_impl.h" 12 #include "mojo/public/cpp/bindings/interface_impl.h"
13 #include "mojo/public/cpp/bindings/strong_binding.h" 13 #include "mojo/public/cpp/bindings/strong_binding.h"
14 #include "mojo/public/interfaces/application/application.mojom.h" 14 #include "mojo/public/interfaces/application/application.mojom.h"
15 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom. h" 15 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom. h"
16 #include "mojo/services/navigation/public/interfaces/navigation.mojom.h" 16 #include "mojo/services/navigation/public/interfaces/navigation.mojom.h"
17 #include "mojo/services/network/public/interfaces/url_loader.mojom.h" 17 #include "mojo/services/network/public/interfaces/url_loader.mojom.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/service_registry/service_registry.mojom.h"
22 #include "sky/compositor/layer_client.h" 22 #include "sky/compositor/layer_client.h"
23 #include "sky/compositor/layer_host_client.h" 23 #include "sky/compositor/layer_host_client.h"
24 #include "sky/engine/public/platform/ServiceProvider.h" 24 #include "sky/engine/public/platform/ServiceProvider.h"
25 #include "sky/engine/public/web/WebFrameClient.h" 25 #include "sky/engine/public/web/WebFrameClient.h"
26 #include "sky/engine/public/web/WebViewClient.h" 26 #include "sky/engine/public/web/WebViewClient.h"
27 #include "sky/services/testing/test_harness.mojom.h" 27 #include "sky/services/testing/test_harness.mojom.h"
28 #include "ui/events/gestures/gesture_types.h" 28 #include "ui/events/gestures/gesture_types.h"
29 29
30 namespace mojo { 30 namespace mojo {
31 class ViewManager; 31 class ViewManager;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 | « sky/viewer/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698