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

Side by Side Diff: mojo/android/system/base_run_loop.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/android/javatests/mojo_test_case.cc ('k') | mojo/application/public/cpp/BUILD.gn » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/android/system/base_run_loop.h" 5 #include "mojo/android/system/base_run_loop.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 8
9 #include "base/android/base_jni_registrar.h" 9 #include "base/android/base_jni_registrar.h"
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
11 #include "base/android/jni_registrar.h" 11 #include "base/android/jni_registrar.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "jni/BaseRunLoop_jni.h" 14 #include "jni/BaseRunLoop_jni.h"
15 #include "mojo/message_pump/message_pump_mojo.h" 15 #include "mojo/common/message_pump_mojo.h"
16 16
17 namespace mojo { 17 namespace mojo {
18 namespace android { 18 namespace android {
19 19
20 static jlong CreateBaseRunLoop(JNIEnv* env, jobject jcaller) { 20 static jlong CreateBaseRunLoop(JNIEnv* env, jobject jcaller) {
21 base::MessageLoop* message_loop = 21 base::MessageLoop* message_loop =
22 new base::MessageLoop(common::MessagePumpMojo::Create()); 22 new base::MessageLoop(common::MessagePumpMojo::Create());
23 return reinterpret_cast<uintptr_t>(message_loop); 23 return reinterpret_cast<uintptr_t>(message_loop);
24 } 24 }
25 25
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 } 63 }
64 64
65 bool RegisterBaseRunLoop(JNIEnv* env) { 65 bool RegisterBaseRunLoop(JNIEnv* env) {
66 return RegisterNativesImpl(env); 66 return RegisterNativesImpl(env);
67 } 67 }
68 68
69 } // namespace android 69 } // namespace android
70 } // namespace mojo 70 } // namespace mojo
71 71
72 72
OLDNEW
« no previous file with comments | « mojo/android/javatests/mojo_test_case.cc ('k') | mojo/application/public/cpp/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698