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

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

Issue 1058163002: Replaces |shell_handle| with |application_request| as the name of the parameter to MojoMain(). (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 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/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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_; 101 scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_;
102 EmbedderPtr embedder_; 102 EmbedderPtr embedder_;
103 mojo::ServiceProviderImpl embeddee_provider_impl_; 103 mojo::ServiceProviderImpl embeddee_provider_impl_;
104 scoped_ptr<mojo::BitmapUploader> bitmap_uploader_; 104 scoped_ptr<mojo::BitmapUploader> bitmap_uploader_;
105 105
106 DISALLOW_COPY_AND_ASSIGN(WMFlowEmbedded); 106 DISALLOW_COPY_AND_ASSIGN(WMFlowEmbedded);
107 }; 107 };
108 108
109 } // namespace examples 109 } // namespace examples
110 110
111 MojoResult MojoMain(MojoHandle shell_handle) { 111 MojoResult MojoMain(MojoHandle application_request) {
112 mojo::ApplicationRunnerChromium runner(new examples::WMFlowEmbedded); 112 mojo::ApplicationRunnerChromium runner(new examples::WMFlowEmbedded);
113 return runner.Run(shell_handle); 113 return runner.Run(application_request);
114 } 114 }
115 115
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