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

Side by Side Diff: mojo/runner/android/main.cc

Issue 1107233002: Move runner stuff into a runner namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 7 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 | « mojo/runner/android/main.h ('k') | mojo/runner/android/native_viewport_application_loader.h » ('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 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/runner/android/main.h" 5 #include "mojo/runner/android/main.h"
6 6
7 #include "base/android/fifo_utils.h" 7 #include "base/android/fifo_utils.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_array.h" 9 #include "base/android/jni_array.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 15 matching lines...) Expand all
26 #include "mojo/runner/android/native_viewport_application_loader.h" 26 #include "mojo/runner/android/native_viewport_application_loader.h"
27 #include "mojo/runner/android/ui_application_loader_android.h" 27 #include "mojo/runner/android/ui_application_loader_android.h"
28 #include "mojo/runner/context.h" 28 #include "mojo/runner/context.h"
29 #include "mojo/runner/init.h" 29 #include "mojo/runner/init.h"
30 #include "mojo/shell/application_loader.h" 30 #include "mojo/shell/application_loader.h"
31 #include "ui/gl/gl_surface_egl.h" 31 #include "ui/gl/gl_surface_egl.h"
32 32
33 using base::LazyInstance; 33 using base::LazyInstance;
34 34
35 namespace mojo { 35 namespace mojo {
36 namespace shell { 36 namespace runner {
37 37
38 namespace { 38 namespace {
39 39
40 // Tag for logging. 40 // Tag for logging.
41 const char kLogTag[] = "chromium"; 41 const char kLogTag[] = "chromium";
42 42
43 // Command line argument for the communication fifo. 43 // Command line argument for the communication fifo.
44 const char kFifoPath[] = "fifo-path"; 44 const char kFifoPath[] = "fifo-path";
45 45
46 class MojoShellRunner : public base::DelegateSimpleThread::Delegate { 46 class MojoShellRunner : public base::DelegateSimpleThread::Delegate {
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 194
195 static void AddApplicationURL(JNIEnv* env, jclass clazz, jstring jurl) { 195 static void AddApplicationURL(JNIEnv* env, jclass clazz, jstring jurl) {
196 base::CommandLine::ForCurrentProcess()->AppendArg( 196 base::CommandLine::ForCurrentProcess()->AppendArg(
197 base::android::ConvertJavaStringToUTF8(env, jurl)); 197 base::android::ConvertJavaStringToUTF8(env, jurl));
198 } 198 }
199 199
200 bool RegisterShellMain(JNIEnv* env) { 200 bool RegisterShellMain(JNIEnv* env) {
201 return RegisterNativesImpl(env); 201 return RegisterNativesImpl(env);
202 } 202 }
203 203
204 } // namespace shell 204 } // namespace runner
205 } // namespace mojo 205 } // namespace mojo
206 206
207 // TODO(vtl): Even though main() should never be called, mojo_shell fails to 207 // TODO(vtl): Even though main() should never be called, mojo_shell fails to
208 // link without it. Figure out if we can avoid this. 208 // link without it. Figure out if we can avoid this.
209 int main(int argc, char** argv) { 209 int main(int argc, char** argv) {
210 NOTREACHED(); 210 NOTREACHED();
211 } 211 }
OLDNEW
« no previous file with comments | « mojo/runner/android/main.h ('k') | mojo/runner/android/native_viewport_application_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698