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

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

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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/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 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 "mojo/runner/android/android_handler.h" 5 #include "mojo/runner/android/android_handler.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/scoped_native_library.h" 11 #include "base/scoped_native_library.h"
12 #include "jni/AndroidHandler_jni.h" 12 #include "jni/AndroidHandler_jni.h"
13 #include "mojo/application/public/cpp/application_impl.h" 13 #include "mojo/application/public/cpp/application_impl.h"
14 #include "mojo/common/data_pipe_utils.h" 14 #include "mojo/common/data_pipe_utils.h"
15 #include "mojo/public/c/system/main.h"
15 #include "mojo/runner/android/run_android_application_function.h" 16 #include "mojo/runner/android/run_android_application_function.h"
16 #include "mojo/runner/host/native_application_support.h" 17 #include "mojo/runner/host/native_application_support.h"
17 #include "mojo/util/filename_util.h" 18 #include "mojo/util/filename_util.h"
18 #include "third_party/mojo/src/mojo/public/c/system/main.h"
19 #include "url/gurl.h" 19 #include "url/gurl.h"
20 20
21 using base::android::AttachCurrentThread; 21 using base::android::AttachCurrentThread;
22 using base::android::ScopedJavaLocalRef; 22 using base::android::ScopedJavaLocalRef;
23 using base::android::ConvertJavaStringToUTF8; 23 using base::android::ConvertJavaStringToUTF8;
24 using base::android::ConvertUTF8ToJavaString; 24 using base::android::ConvertUTF8ToJavaString;
25 using base::android::GetApplicationContext; 25 using base::android::GetApplicationContext;
26 26
27 namespace mojo { 27 namespace mojo {
28 namespace runner { 28 namespace runner {
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 connection->AddService(&content_handler_factory_); 171 connection->AddService(&content_handler_factory_);
172 return true; 172 return true;
173 } 173 }
174 174
175 bool RegisterAndroidHandlerJni(JNIEnv* env) { 175 bool RegisterAndroidHandlerJni(JNIEnv* env) {
176 return RegisterNativesImpl(env); 176 return RegisterNativesImpl(env);
177 } 177 }
178 178
179 } // namespace runner 179 } // namespace runner
180 } // namespace mojo 180 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/runner/BUILD.gn ('k') | mojo/runner/child/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698