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

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

Issue 815003002: Nukes ViewManager arg from ViewManagerDelegate::OnEmbed (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: format Created 6 years 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/wm_flow/app/app.cc ('k') | examples/wm_flow/wm/wm.cc » ('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 "base/macros.h" 6 #include "base/macros.h"
7 #include "examples/bitmap_uploader/bitmap_uploader.h" 7 #include "examples/bitmap_uploader/bitmap_uploader.h"
8 #include "examples/wm_flow/app/embedder.mojom.h" 8 #include "examples/wm_flow/app/embedder.mojom.h"
9 #include "examples/wm_flow/embedded/embeddee.mojom.h" 9 #include "examples/wm_flow/embedded/embeddee.mojom.h"
10 #include "mojo/application/application_runner_chromium.h" 10 #include "mojo/application/application_runner_chromium.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 new mojo::ViewManagerClientFactory(app->shell(), this)); 55 new mojo::ViewManagerClientFactory(app->shell(), this));
56 } 56 }
57 virtual bool ConfigureIncomingConnection( 57 virtual bool ConfigureIncomingConnection(
58 mojo::ApplicationConnection* connection) override { 58 mojo::ApplicationConnection* connection) override {
59 connection->AddService(view_manager_client_factory_.get()); 59 connection->AddService(view_manager_client_factory_.get());
60 return true; 60 return true;
61 } 61 }
62 62
63 // Overridden from mojo::ViewManagerDelegate: 63 // Overridden from mojo::ViewManagerDelegate:
64 virtual void OnEmbed( 64 virtual void OnEmbed(
65 mojo::ViewManager* view_manager,
66 mojo::View* root, 65 mojo::View* root,
67 mojo::ServiceProviderImpl* exported_services, 66 mojo::ServiceProviderImpl* exported_services,
68 scoped_ptr<mojo::ServiceProvider> imported_services) override { 67 scoped_ptr<mojo::ServiceProvider> imported_services) override {
69 bitmap_uploader_.reset(new mojo::BitmapUploader(root)); 68 bitmap_uploader_.reset(new mojo::BitmapUploader(root));
70 bitmap_uploader_->Init(shell_); 69 bitmap_uploader_->Init(shell_);
71 bitmap_uploader_->SetColor(SK_ColorMAGENTA); 70 bitmap_uploader_->SetColor(SK_ColorMAGENTA);
72 71
73 exported_services->AddService(&embeddee_factory_); 72 exported_services->AddService(&embeddee_factory_);
74 mojo::ConnectToService(imported_services.get(), &embedder_); 73 mojo::ConnectToService(imported_services.get(), &embedder_);
75 embedder_->HelloWorld(base::Bind(&WMFlowEmbedded::HelloWorldAck, 74 embedder_->HelloWorld(base::Bind(&WMFlowEmbedded::HelloWorldAck,
(...skipping 15 matching lines...) Expand all
91 DISALLOW_COPY_AND_ASSIGN(WMFlowEmbedded); 90 DISALLOW_COPY_AND_ASSIGN(WMFlowEmbedded);
92 }; 91 };
93 92
94 } // namespace examples 93 } // namespace examples
95 94
96 MojoResult MojoMain(MojoHandle shell_handle) { 95 MojoResult MojoMain(MojoHandle shell_handle) {
97 mojo::ApplicationRunnerChromium runner(new examples::WMFlowEmbedded); 96 mojo::ApplicationRunnerChromium runner(new examples::WMFlowEmbedded);
98 return runner.Run(shell_handle); 97 return runner.Run(shell_handle);
99 } 98 }
100 99
OLDNEW
« no previous file with comments | « examples/wm_flow/app/app.cc ('k') | examples/wm_flow/wm/wm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698