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

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

Issue 2178973004: DialogSurfaceManager implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: DialogSurfaceManager.java => DialogSurfaceManagerImpl.java and stopped using activity for window to… Created 4 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
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 12
13 namespace { 13 namespace {
14 14
15 base::android::RegistrationMethod kContentRegisteredMethods[] = { 15 base::android::RegistrationMethod kContentRegisteredMethods[] = {
16 { "ContentMain", content::RegisterContentMain }, 16 {"ContentMain", content::RegisterContentMain},
boliu 2016/11/04 00:07:19 err, avoid white space changes in gigantic CL..?
liberato (no reviews please) 2016/11/11 21:52:35 weird -- i can imagine that i indented accidentall
17 { "ChildProcessServiceImpl", content::RegisterChildProcessServiceImpl }, 17 {"ChildProcessServiceImpl", content::RegisterChildProcessServiceImpl},
18 }; 18 };
19 19
20 } // namespace 20 } // namespace
21 21
22 namespace content { 22 namespace content {
23 namespace android { 23 namespace android {
24 24
25 bool RegisterAppJni(JNIEnv* env) { 25 bool RegisterAppJni(JNIEnv* env) {
26 return RegisterNativeMethods(env, kContentRegisteredMethods, 26 return RegisterNativeMethods(env, kContentRegisteredMethods,
27 arraysize(kContentRegisteredMethods)); 27 arraysize(kContentRegisteredMethods));
28 } 28 }
29 29
30 } // namespace android 30 } // namespace android
31 } // namespace content 31 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698