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

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

Issue 533933002: Fix wm_flow_app so that it uses MojoMain() directly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | no next file » | 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/examples/wm_flow/app/embedder.mojom.h" 6 #include "mojo/examples/wm_flow/app/embedder.mojom.h"
7 #include "mojo/examples/wm_flow/embedded/embeddee.mojom.h" 7 #include "mojo/examples/wm_flow/embedded/embeddee.mojom.h"
8 #include "mojo/public/c/system/main.h"
8 #include "mojo/public/cpp/application/application_connection.h" 9 #include "mojo/public/cpp/application/application_connection.h"
9 #include "mojo/public/cpp/application/application_delegate.h" 10 #include "mojo/public/cpp/application/application_delegate.h"
10 #include "mojo/public/cpp/application/application_impl.h" 11 #include "mojo/public/cpp/application/application_impl.h"
12 #include "mojo/public/cpp/application/application_runner_chromium.h"
11 #include "mojo/public/cpp/application/connect.h" 13 #include "mojo/public/cpp/application/connect.h"
12 #include "mojo/public/cpp/application/interface_factory_impl.h" 14 #include "mojo/public/cpp/application/interface_factory_impl.h"
13 #include "mojo/public/cpp/application/service_provider_impl.h" 15 #include "mojo/public/cpp/application/service_provider_impl.h"
14 #include "mojo/public/interfaces/application/service_provider.mojom.h" 16 #include "mojo/public/interfaces/application/service_provider.mojom.h"
15 #include "mojo/services/public/cpp/view_manager/view.h" 17 #include "mojo/services/public/cpp/view_manager/view.h"
16 #include "mojo/services/public/cpp/view_manager/view_manager.h" 18 #include "mojo/services/public/cpp/view_manager/view_manager.h"
17 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" 19 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
18 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" 20 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
19 #include "mojo/services/public/cpp/view_manager/view_observer.h" 21 #include "mojo/services/public/cpp/view_manager/view_observer.h"
20 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" 22 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 mojo::ViewManagerClientFactory view_manager_client_factory_; 130 mojo::ViewManagerClientFactory view_manager_client_factory_;
129 mojo::InterfaceFactoryImpl<EmbedderImpl> embedder_factory_; 131 mojo::InterfaceFactoryImpl<EmbedderImpl> embedder_factory_;
130 EmbeddeePtr embeddee_; 132 EmbeddeePtr embeddee_;
131 mojo::ApplicationImpl* app_; 133 mojo::ApplicationImpl* app_;
132 134
133 DISALLOW_COPY_AND_ASSIGN(WMFlowApp); 135 DISALLOW_COPY_AND_ASSIGN(WMFlowApp);
134 }; 136 };
135 137
136 } // namespace examples 138 } // namespace examples
137 139
138 namespace mojo { 140 MojoResult MojoMain(MojoHandle shell_handle) {
139 141 mojo::ApplicationRunnerChromium runner(new examples::WMFlowApp);
140 // static 142 return runner.Run(shell_handle);
141 ApplicationDelegate* ApplicationDelegate::Create() {
142 return new examples::WMFlowApp;
143 } 143 }
144
145 } // namespace
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698