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

Side by Side Diff: mojo/examples/wm_flow/init/init.cc

Issue 591633002: Replace most uses of ViewManagerInitService with client lib ViewManager::Embed() to offer the same … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 2 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 | « mojo/examples/wm_flow/embedded/embedded.cc ('k') | mojo/mojo_examples.gypi » ('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 "base/bind.h" 5 #include "base/bind.h"
6 #include "mojo/application/application_runner_chromium.h" 6 #include "mojo/application/application_runner_chromium.h"
7 #include "mojo/public/c/system/main.h" 7 #include "mojo/public/c/system/main.h"
8 #include "mojo/public/cpp/application/application_delegate.h" 8 #include "mojo/public/cpp/application/application_delegate.h"
9 #include "mojo/public/cpp/application/application_impl.h" 9 #include "mojo/public/cpp/application/application_impl.h"
10 #include "mojo/public/cpp/application/service_provider_impl.h" 10 #include "mojo/public/cpp/application/service_provider_impl.h"
11 #include "mojo/public/interfaces/application/service_provider.mojom.h" 11 #include "mojo/public/interfaces/application/service_provider.mojom.h"
12 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" 12 #include "mojo/services/public/cpp/view_manager/view_manager.h"
13 #include "mojo/services/public/cpp/view_manager/view_manager_context.h"
13 14
14 namespace examples { 15 namespace examples {
15 namespace {
16 void ConnectCallback(bool success) {}
17 } // namespace
18 16
19 // This application starts the view manager, embeds the window manager and then 17 // This application starts the view manager, embeds the window manager and then
20 // starts another app (wm_flow_app) which also connects to the view manager and 18 // starts another app (wm_flow_app) which also connects to the view manager and
21 // asks to be embedded without context. 19 // asks to be embedded without context.
22 class WMFlowInit : public mojo::ApplicationDelegate { 20 class WMFlowInit : public mojo::ApplicationDelegate {
23 public: 21 public:
24 WMFlowInit() {} 22 WMFlowInit() {}
25 virtual ~WMFlowInit() {} 23 virtual ~WMFlowInit() {}
26 24
27 private: 25 private:
28 // Overridden from Application: 26 // Overridden from Application:
29 virtual void Initialize(mojo::ApplicationImpl* app) MOJO_OVERRIDE { 27 virtual void Initialize(mojo::ApplicationImpl* app) MOJO_OVERRIDE {
30 app->ConnectToService("mojo:mojo_view_manager", &view_manager_init_); 28 context_.reset(new mojo::ViewManagerContext(app));
31 mojo::ServiceProviderPtr sp; 29 context_->Embed("mojo:mojo_wm_flow_wm");
32 mojo::BindToProxy(new mojo::ServiceProviderImpl, &sp);
33 view_manager_init_->Embed("mojo:mojo_wm_flow_wm", sp.Pass(),
34 base::Bind(&ConnectCallback));
35 app->ConnectToApplication("mojo:mojo_wm_flow_app"); 30 app->ConnectToApplication("mojo:mojo_wm_flow_app");
36 } 31 }
37 32
38 void OnConnect(bool success) {} 33 scoped_ptr<mojo::ViewManagerContext> context_;
39
40 mojo::ViewManagerInitServicePtr view_manager_init_;
41 34
42 DISALLOW_COPY_AND_ASSIGN(WMFlowInit); 35 DISALLOW_COPY_AND_ASSIGN(WMFlowInit);
43 }; 36 };
44 37
45 } // namespace examples 38 } // namespace examples
46 39
47 MojoResult MojoMain(MojoHandle shell_handle) { 40 MojoResult MojoMain(MojoHandle shell_handle) {
48 mojo::ApplicationRunnerChromium runner(new examples::WMFlowInit); 41 mojo::ApplicationRunnerChromium runner(new examples::WMFlowInit);
49 return runner.Run(shell_handle); 42 return runner.Run(shell_handle);
50 } 43 }
OLDNEW
« no previous file with comments | « mojo/examples/wm_flow/embedded/embedded.cc ('k') | mojo/mojo_examples.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698