| OLD | NEW |
| 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/shell/android/shell_jni_registrar.h" | 5 #include "content/shell/android/shell_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/shell/android/shell_manager.h" | 10 #include "content/shell/android/shell_manager.h" |
| 11 #include "content/shell/browser/shell.h" | 11 #include "content/shell/browser/shell.h" |
| 12 #include "content/shell/browser/shell_mojo_test_utils_android.h" | |
| 13 | 12 |
| 14 namespace { | 13 namespace { |
| 15 | 14 |
| 16 static base::android::RegistrationMethod kShellRegistrationMethods[] = { | 15 static base::android::RegistrationMethod kShellRegistrationMethods[] = { |
| 17 {"Shell", content::Shell::Register}, | 16 {"Shell", content::Shell::Register}, |
| 18 {"ShellManager", content::RegisterShellManager}, | 17 {"ShellManager", content::RegisterShellManager}, |
| 19 {"ShellMojoTestUtils", content::RegisterShellMojoTestUtils}, | |
| 20 }; | 18 }; |
| 21 | 19 |
| 22 } // namespace | 20 } // namespace |
| 23 | 21 |
| 24 namespace content { | 22 namespace content { |
| 25 namespace android { | 23 namespace android { |
| 26 | 24 |
| 27 bool RegisterShellJni(JNIEnv* env) { | 25 bool RegisterShellJni(JNIEnv* env) { |
| 28 return RegisterNativeMethods(env, kShellRegistrationMethods, | 26 return RegisterNativeMethods(env, kShellRegistrationMethods, |
| 29 arraysize(kShellRegistrationMethods)); | 27 arraysize(kShellRegistrationMethods)); |
| 30 } | 28 } |
| 31 | 29 |
| 32 } // namespace android | 30 } // namespace android |
| 33 } // namespace content | 31 } // namespace content |
| OLD | NEW |