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

Side by Side Diff: examples/wm_flow/app/app.cc

Issue 1250463002: Renames WeakBindingSet to BindingSet. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebasing 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 | « examples/window_manager/window_manager.cc ('k') | mojo/common/BUILD.gn » ('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 #include <map> 5 #include <map>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "examples/bitmap_uploader/bitmap_uploader.h" 10 #include "examples/bitmap_uploader/bitmap_uploader.h"
11 #include "examples/wm_flow/app/embedder.mojom.h" 11 #include "examples/wm_flow/app/embedder.mojom.h"
12 #include "examples/wm_flow/embedded/embeddee.mojom.h" 12 #include "examples/wm_flow/embedded/embeddee.mojom.h"
13 #include "mojo/application/application_runner_chromium.h" 13 #include "mojo/application/application_runner_chromium.h"
14 #include "mojo/common/weak_binding_set.h" 14 #include "mojo/common/binding_set.h"
15 #include "mojo/public/c/system/main.h" 15 #include "mojo/public/c/system/main.h"
16 #include "mojo/public/cpp/application/application_connection.h" 16 #include "mojo/public/cpp/application/application_connection.h"
17 #include "mojo/public/cpp/application/application_delegate.h" 17 #include "mojo/public/cpp/application/application_delegate.h"
18 #include "mojo/public/cpp/application/application_impl.h" 18 #include "mojo/public/cpp/application/application_impl.h"
19 #include "mojo/public/cpp/application/connect.h" 19 #include "mojo/public/cpp/application/connect.h"
20 #include "mojo/public/cpp/application/interface_factory_impl.h" 20 #include "mojo/public/cpp/application/interface_factory_impl.h"
21 #include "mojo/public/cpp/application/service_provider_impl.h" 21 #include "mojo/public/cpp/application/service_provider_impl.h"
22 #include "mojo/public/cpp/bindings/strong_binding.h" 22 #include "mojo/public/cpp/bindings/strong_binding.h"
23 #include "mojo/public/interfaces/application/service_provider.mojom.h" 23 #include "mojo/public/interfaces/application/service_provider.mojom.h"
24 #include "mojo/services/view_manager/public/cpp/view.h" 24 #include "mojo/services/view_manager/public/cpp/view.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 62
63 private: 63 private:
64 // mojo::ServiceProvider implementation 64 // mojo::ServiceProvider implementation
65 void ConnectToService(const mojo::String& interface_name, 65 void ConnectToService(const mojo::String& interface_name,
66 mojo::ScopedMessagePipeHandle pipe_handle) override { 66 mojo::ScopedMessagePipeHandle pipe_handle) override {
67 if (interface_name != Embedder::Name_) 67 if (interface_name != Embedder::Name_)
68 return; 68 return;
69 new EmbedderImpl(mojo::MakeRequest<Embedder>(pipe_handle.Pass())); 69 new EmbedderImpl(mojo::MakeRequest<Embedder>(pipe_handle.Pass()));
70 } 70 }
71 71
72 mojo::WeakBindingSet<mojo::ServiceProvider> embeddee_exposed_services_; 72 mojo::BindingSet<mojo::ServiceProvider> embeddee_exposed_services_;
73 73
74 DISALLOW_COPY_AND_ASSIGN(EmbedderImplProvider); 74 DISALLOW_COPY_AND_ASSIGN(EmbedderImplProvider);
75 }; 75 };
76 76
77 } // namespace 77 } // namespace
78 78
79 // This app starts its life via Connect() rather than by being embed, so it does 79 // This app starts its life via Connect() rather than by being embed, so it does
80 // not start with a connection to the ViewManager service. It has to obtain a 80 // not start with a connection to the ViewManager service. It has to obtain a
81 // connection by connecting to the ViewManagerInit service and asking to be 81 // connection by connecting to the ViewManagerInit service and asking to be
82 // embed without a view context. 82 // embed without a view context.
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 186
187 DISALLOW_COPY_AND_ASSIGN(WMFlowApp); 187 DISALLOW_COPY_AND_ASSIGN(WMFlowApp);
188 }; 188 };
189 189
190 } // namespace examples 190 } // namespace examples
191 191
192 MojoResult MojoMain(MojoHandle application_request) { 192 MojoResult MojoMain(MojoHandle application_request) {
193 mojo::ApplicationRunnerChromium runner(new examples::WMFlowApp); 193 mojo::ApplicationRunnerChromium runner(new examples::WMFlowApp);
194 return runner.Run(application_request); 194 return runner.Run(application_request);
195 } 195 }
OLDNEW
« no previous file with comments | « examples/window_manager/window_manager.cc ('k') | mojo/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698