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

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

Issue 1280463003: Revert of Straightens outs DEPS in mojo/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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/BUILD.gn ('k') | mojo/runner/child_process.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 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"
11 #include "base/at_exit.h" 11 #include "base/at_exit.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/files/file_util.h" 15 #include "base/files/file_util.h"
16 #include "base/lazy_instance.h" 16 #include "base/lazy_instance.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/message_loop/message_loop.h" 19 #include "base/message_loop/message_loop.h"
20 #include "base/run_loop.h" 20 #include "base/run_loop.h"
21 #include "components/view_manager/android_loader.h" 21 #include "components/view_manager/android_loader.h"
22 #include "jni/ShellMain_jni.h" 22 #include "jni/ShellMain_jni.h"
23 #include "mojo/message_pump/message_pump_mojo.h" 23 #include "mojo/common/message_pump_mojo.h"
24 #include "mojo/runner/android/android_handler_loader.h" 24 #include "mojo/runner/android/android_handler_loader.h"
25 #include "mojo/runner/android/background_application_loader.h" 25 #include "mojo/runner/android/background_application_loader.h"
26 #include "mojo/runner/android/context_init.h" 26 #include "mojo/runner/android/context_init.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/child_process.h" 28 #include "mojo/runner/child_process.h"
29 #include "mojo/runner/context.h" 29 #include "mojo/runner/context.h"
30 #include "mojo/runner/init.h" 30 #include "mojo/runner/init.h"
31 #include "mojo/shell/application_loader.h" 31 #include "mojo/shell/application_loader.h"
32 #include "ui/gl/gl_surface_egl.h" 32 #include "ui/gl/gl_surface_egl.h"
33 33
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 } // namespace runner 180 } // namespace runner
181 } // namespace mojo 181 } // namespace mojo
182 182
183 int main(int argc, char** argv) { 183 int main(int argc, char** argv) {
184 base::AtExitManager at_exit; 184 base::AtExitManager at_exit;
185 base::CommandLine::Init(argc, argv); 185 base::CommandLine::Init(argc, argv);
186 186
187 mojo::runner::InitializeLogging(); 187 mojo::runner::InitializeLogging();
188 return mojo::runner::ChildProcessMain(); 188 return mojo::runner::ChildProcessMain();
189 } 189 }
OLDNEW
« no previous file with comments | « mojo/runner/BUILD.gn ('k') | mojo/runner/child_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698