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

Side by Side Diff: mojo/ui/view_provider_app.cc

Issue 1682113003: Mojo C++ bindings: Generate InterfaceHandle<> instead of InterfacePtr<>. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 10 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "mojo/ui/view_provider_app.h" 5 #include "mojo/ui/view_provider_app.h"
6 6
7 #include <utility>
8
7 #include "base/command_line.h" 9 #include "base/command_line.h"
8 #include "base/logging.h" 10 #include "base/logging.h"
9 11
10 namespace mojo { 12 namespace mojo {
11 namespace ui { 13 namespace ui {
12 14
13 class ViewProviderApp::DelegatingViewProvider : public mojo::ui::ViewProvider { 15 class ViewProviderApp::DelegatingViewProvider : public mojo::ui::ViewProvider {
14 public: 16 public:
15 DelegatingViewProvider(ViewProviderApp* app, 17 DelegatingViewProvider(ViewProviderApp* app,
16 const std::string& view_provider_url) 18 const std::string& view_provider_url)
17 : app_(app), view_provider_url_(view_provider_url) {} 19 : app_(app), view_provider_url_(view_provider_url) {}
18 20
19 ~DelegatingViewProvider() override {} 21 ~DelegatingViewProvider() override {}
20 22
21 private: 23 private:
22 // |ViewProvider|: 24 // |ViewProvider|:
23 void CreateView( 25 void CreateView(
24 mojo::InterfaceRequest<mojo::ServiceProvider> services, 26 mojo::InterfaceRequest<mojo::ServiceProvider> services,
25 mojo::ServiceProviderPtr exposed_services, 27 mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services,
26 const mojo::ui::ViewProvider::CreateViewCallback& callback) override { 28 const mojo::ui::ViewProvider::CreateViewCallback& callback) override {
27 app_->CreateView(this, view_provider_url_, services.Pass(), 29 app_->CreateView(
28 exposed_services.Pass(), callback); 30 this, view_provider_url_, services.Pass(),
31 mojo::ServiceProviderPtr::Create(std::move(exposed_services)),
32 callback);
29 } 33 }
30 34
31 ViewProviderApp* app_; 35 ViewProviderApp* app_;
32 std::string view_provider_url_; 36 std::string view_provider_url_;
33 37
34 MOJO_DISALLOW_COPY_AND_ASSIGN(DelegatingViewProvider); 38 MOJO_DISALLOW_COPY_AND_ASSIGN(DelegatingViewProvider);
35 }; 39 };
36 40
37 ViewProviderApp::ViewProviderApp() {} 41 ViewProviderApp::ViewProviderApp() {}
38 42
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 const mojo::ui::ViewProvider::CreateViewCallback& callback) { 74 const mojo::ui::ViewProvider::CreateViewCallback& callback) {
71 if (!CreateView(view_provider_url, services.Pass(), exposed_services.Pass(), 75 if (!CreateView(view_provider_url, services.Pass(), exposed_services.Pass(),
72 callback)) { 76 callback)) {
73 bindings_.RemoveBindings(provider); 77 bindings_.RemoveBindings(provider);
74 delete provider; 78 delete provider;
75 } 79 }
76 } 80 }
77 81
78 } // namespace ui 82 } // namespace ui
79 } // namespace mojo 83 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698