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

Side by Side Diff: mojo/shell/android/mojo_main.cc

Issue 219583003: Mojo: Move mojo/public/shell to mojo/public/{cpp,interfaces}/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "mojo/shell/android/mojo_main.h" 5 #include "mojo/shell/android/mojo_main.h"
6 6
7 #include "base/android/jni_string.h" 7 #include "base/android/jni_string.h"
8 #include "base/at_exit.h" 8 #include "base/at_exit.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "jni/MojoMain_jni.h" 15 #include "jni/MojoMain_jni.h"
16 #include "mojo/public/shell/application.h" 16 #include "mojo/public/cpp/shell/application.h"
17 #include "mojo/service_manager/service_loader.h" 17 #include "mojo/service_manager/service_loader.h"
18 #include "mojo/service_manager/service_manager.h" 18 #include "mojo/service_manager/service_manager.h"
19 #include "mojo/services/native_viewport/native_viewport_service.h" 19 #include "mojo/services/native_viewport/native_viewport_service.h"
20 #include "mojo/shell/context.h" 20 #include "mojo/shell/context.h"
21 #include "mojo/shell/init.h" 21 #include "mojo/shell/init.h"
22 #include "mojo/shell/run.h" 22 #include "mojo/shell/run.h"
23 #include "ui/gl/gl_surface_egl.h" 23 #include "ui/gl/gl_surface_egl.h"
24 24
25 using base::LazyInstance; 25 using base::LazyInstance;
26 26
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 105
106 g_context.Get().reset(shell_context); 106 g_context.Get().reset(shell_context);
107 shell::Run(shell_context); 107 shell::Run(shell_context);
108 } 108 }
109 109
110 bool RegisterMojoMain(JNIEnv* env) { 110 bool RegisterMojoMain(JNIEnv* env) {
111 return RegisterNativesImpl(env); 111 return RegisterNativesImpl(env);
112 } 112 }
113 113
114 } // namespace mojo 114 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/services/native_viewport/native_viewport_service.cc ('k') | mojo/shell/dynamic_service_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698