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

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

Issue 845593003: Pass ServiceProvider and ServiceProvider& params in Connect (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 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 29 matching lines...) Expand all
40 class LayerHost; 40 class LayerHost;
41 41
42 class DocumentView : public blink::ServiceProvider, 42 class DocumentView : public blink::ServiceProvider,
43 public blink::WebViewClient, 43 public blink::WebViewClient,
44 public blink::WebFrameClient, 44 public blink::WebFrameClient,
45 public sky::LayerClient, 45 public sky::LayerClient,
46 public sky::LayerHostClient, 46 public sky::LayerHostClient,
47 public mojo::ViewManagerDelegate, 47 public mojo::ViewManagerDelegate,
48 public mojo::ViewObserver { 48 public mojo::ViewObserver {
49 public: 49 public:
50 DocumentView(mojo::ServiceProviderPtr provider, 50 DocumentView(mojo::InterfaceRequest<mojo::ServiceProvider> services,
51 mojo::ServiceProviderPtr exported_services,
51 mojo::URLResponsePtr response, 52 mojo::URLResponsePtr response,
52 mojo::Shell* shell); 53 mojo::Shell* shell);
53 virtual ~DocumentView(); 54 virtual ~DocumentView();
54 55
55 base::WeakPtr<DocumentView> GetWeakPtr(); 56 base::WeakPtr<DocumentView> GetWeakPtr();
56 57
57 blink::WebView* web_view() const { return web_view_; } 58 blink::WebView* web_view() const { return web_view_; }
58 mojo::ServiceProvider* imported_services() const { 59 mojo::ServiceProvider* imported_services() const {
59 return imported_services_.get(); 60 return imported_services_.get();
60 } 61 }
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 scoped_ptr<inspector::InspectorBackendMojo> inspector_backend_; 133 scoped_ptr<inspector::InspectorBackendMojo> inspector_backend_;
133 base::WeakPtrFactory<DocumentView> weak_factory_; 134 base::WeakPtrFactory<DocumentView> weak_factory_;
134 int debugger_id_; 135 int debugger_id_;
135 136
136 DISALLOW_COPY_AND_ASSIGN(DocumentView); 137 DISALLOW_COPY_AND_ASSIGN(DocumentView);
137 }; 138 };
138 139
139 } // namespace sky 140 } // namespace sky
140 141
141 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_ 142 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698