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

Side by Side Diff: content/common/android/common_jni_registrar.cc

Issue 11886074: Use correct favicon scale factor on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renamed and added JavaBitmap JNI registration to .h Created 7 years, 11 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 | Annotate | Revision Log
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/common/android/common_jni_registrar.h" 5 #include "content/common/android/common_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 "content/common/android/command_line.h" 9 #include "content/common/android/command_line.h"
10 #include "content/common/android/device_info.h"
11 #include "content/common/android/surface_callback.h" 10 #include "content/common/android/surface_callback.h"
12 #include "content/common/android/surface_texture_listener.h" 11 #include "content/common/android/surface_texture_listener.h"
13 #include "content/common/android/trace_event_binding.h" 12 #include "content/common/android/trace_event_binding.h"
14 13
15 namespace { 14 namespace {
16 base::android::RegistrationMethod kContentRegisteredMethods[] = { 15 base::android::RegistrationMethod kContentRegisteredMethods[] = {
17 { "CommandLine", RegisterCommandLine }, 16 { "CommandLine", RegisterCommandLine },
18 { "DeviceInfo", content::RegisterDeviceInfo },
19 { "SurfaceCallback", content::RegisterSurfaceCallback }, 17 { "SurfaceCallback", content::RegisterSurfaceCallback },
20 { "SurfaceTextureListener", 18 { "SurfaceTextureListener",
21 content::SurfaceTextureListener::RegisterSurfaceTextureListener }, 19 content::SurfaceTextureListener::RegisterSurfaceTextureListener },
22 { "TraceEvent", RegisterTraceEvent }, 20 { "TraceEvent", RegisterTraceEvent },
23 }; 21 };
24 22
25 } // namespace 23 } // namespace
26 24
27 namespace content { 25 namespace content {
28 namespace android { 26 namespace android {
29 27
30 bool RegisterCommonJni(JNIEnv* env) { 28 bool RegisterCommonJni(JNIEnv* env) {
31 return RegisterNativeMethods(env, kContentRegisteredMethods, 29 return RegisterNativeMethods(env, kContentRegisteredMethods,
32 arraysize(kContentRegisteredMethods)); 30 arraysize(kContentRegisteredMethods));
33 } 31 }
34 32
35 } // namespace android 33 } // namespace android
36 } // namespace content 34 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698