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

Side by Side Diff: mojo/public/cpp/application/lib/mojo_main_chromium.cc

Issue 380413003: Mojo: Use InterfaceFactory<Interface> for service registration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix network_service_loader Created 6 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 | Annotate | Revision Log
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/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.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 10
11 extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain( 11 extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain(
12 MojoHandle shell_handle) { 12 MojoHandle shell_handle) {
13 base::CommandLine::Init(0, NULL); 13 base::CommandLine::Init(0, NULL);
14 #if !defined(COMPONENT_BUILD) 14 #if !defined(COMPONENT_BUILD)
15 base::AtExitManager at_exit; 15 base::AtExitManager at_exit;
16 #endif 16 #endif
17 base::MessageLoop loop; 17 scoped_ptr<mojo::ApplicationDelegate> delegate;
18 scoped_ptr<mojo::ApplicationDelegate> delegate( 18 {
19 mojo::ApplicationDelegate::Create()); 19 // We have to shut down the MessageLoop before destroying the
20 mojo::ApplicationImpl app(delegate.get()); 20 // ApplicationDelegate.
21 app.BindShell(shell_handle); 21 base::MessageLoop loop;
22 loop.Run(); 22 delegate.reset(mojo::ApplicationDelegate::Create());
23 mojo::ApplicationImpl app(delegate.get());
24 app.BindShell(shell_handle);
25 loop.Run();
26 }
23 27
24 return MOJO_RESULT_OK; 28 return MOJO_RESULT_OK;
25 } 29 }
OLDNEW
« no previous file with comments | « mojo/public/cpp/application/interface_factory_with_context.h ('k') | mojo/public/cpp/application/lib/mojo_main_standalone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698