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

Side by Side Diff: content/shell/android/shell_jni_registrar.cc

Issue 1544273002: Switch to standard integer types in content/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
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/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 "content/shell/android/shell_manager.h" 10 #include "content/shell/android/shell_manager.h"
10 #include "content/shell/browser/shell.h" 11 #include "content/shell/browser/shell.h"
11 #include "content/shell/browser/shell_mojo_test_utils_android.h" 12 #include "content/shell/browser/shell_mojo_test_utils_android.h"
12 13
13 namespace { 14 namespace {
14 15
15 static base::android::RegistrationMethod kShellRegistrationMethods[] = { 16 static base::android::RegistrationMethod kShellRegistrationMethods[] = {
16 {"Shell", content::Shell::Register}, 17 {"Shell", content::Shell::Register},
17 {"ShellManager", content::RegisterShellManager}, 18 {"ShellManager", content::RegisterShellManager},
18 {"ShellMojoTestUtils", content::RegisterShellMojoTestUtils}, 19 {"ShellMojoTestUtils", content::RegisterShellMojoTestUtils},
19 }; 20 };
20 21
21 } // namespace 22 } // namespace
22 23
23 namespace content { 24 namespace content {
24 namespace android { 25 namespace android {
25 26
26 bool RegisterShellJni(JNIEnv* env) { 27 bool RegisterShellJni(JNIEnv* env) {
27 return RegisterNativeMethods(env, kShellRegistrationMethods, 28 return RegisterNativeMethods(env, kShellRegistrationMethods,
28 arraysize(kShellRegistrationMethods)); 29 arraysize(kShellRegistrationMethods));
29 } 30 }
30 31
31 } // namespace android 32 } // namespace android
32 } // namespace content 33 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/android/linker_test_apk/chromium_linker_test_linker_tests.cc ('k') | content/shell/app/shell_content_main.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698