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

Side by Side Diff: content/app/android/app_jni_registrar.cc

Issue 1967553002: DO NOT COMMIT - DialogSurface initial implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 4 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 | « content/app/BUILD.gn ('k') | content/app/android/child_process_service_impl.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/app/android/app_jni_registrar.h" 5 #include "content/app/android/app_jni_registrar.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_registrar.h" 8 #include "base/android/jni_registrar.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "content/app/android/child_process_service_impl.h" 10 #include "content/app/android/child_process_service_impl.h"
11 #include "content/app/android/content_main.h" 11 #include "content/app/android/content_main.h"
12 #include "content/app/android/dialog_surface_activity_mapper.h"
12 13
13 namespace { 14 namespace {
14 15
15 base::android::RegistrationMethod kContentRegisteredMethods[] = { 16 base::android::RegistrationMethod kContentRegisteredMethods[] = {
16 { "ContentMain", content::RegisterContentMain }, 17 {"DialogSurfaceActivityMapper",
17 { "ChildProcessServiceImpl", content::RegisterChildProcessServiceImpl }, 18 content::RegisterDialogSurfaceActivityMapper},
19 {"ContentMain", content::RegisterContentMain},
20 {"ChildProcessServiceImpl", content::RegisterChildProcessServiceImpl},
18 }; 21 };
19 22
20 } // namespace 23 } // namespace
21 24
22 namespace content { 25 namespace content {
23 namespace android { 26 namespace android {
24 27
25 bool RegisterAppJni(JNIEnv* env) { 28 bool RegisterAppJni(JNIEnv* env) {
26 return RegisterNativeMethods(env, kContentRegisteredMethods, 29 return RegisterNativeMethods(env, kContentRegisteredMethods,
27 arraysize(kContentRegisteredMethods)); 30 arraysize(kContentRegisteredMethods));
28 } 31 }
29 32
30 } // namespace android 33 } // namespace android
31 } // namespace content 34 } // namespace content
OLDNEW
« no previous file with comments | « content/app/BUILD.gn ('k') | content/app/android/child_process_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698