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

Unified 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: Final rebase after DIP scale fix. 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 side-by-side diff with in-line comments
Download patch
Index: content/common/android/common_jni_registrar.cc
diff --git a/content/common/android/common_jni_registrar.cc b/content/common/android/common_jni_registrar.cc
index d60e9dcde3298658410176780f28f365604ec8e4..3169f44b22f5feb3ea8a146488853a59bffc1930 100644
--- a/content/common/android/common_jni_registrar.cc
+++ b/content/common/android/common_jni_registrar.cc
@@ -7,7 +7,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_registrar.h"
#include "content/common/android/command_line.h"
-#include "content/common/android/device_info.h"
+#include "content/common/android/device_telephony_info.h"
#include "content/common/android/hash_set.h"
#include "content/common/android/surface_callback.h"
#include "content/common/android/surface_texture_listener.h"
@@ -16,7 +16,8 @@
namespace {
base::android::RegistrationMethod kContentRegisteredMethods[] = {
{ "CommandLine", RegisterCommandLine },
- { "DeviceInfo", content::RegisterDeviceInfo },
+ { "DeviceTelephonyInfo",
+ content::DeviceTelephonyInfo::RegisterDeviceTelephonyInfo },
{ "HashSet", content::RegisterHashSet },
{ "SurfaceCallback", content::RegisterSurfaceCallback },
{ "SurfaceTextureListener",
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_android.cc ('k') | content/common/android/device_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698