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

Unified Diff: ui/android/ui_jni_registrar.cc

Issue 11886074: Use correct favicon scale factor on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Split DeviceTelephonyInfo from DeviceDisplayInfo; added SCALE_FACTOR_150P and 300P. 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: ui/android/ui_jni_registrar.cc
diff --git a/ui/android/ui_jni_registrar.cc b/ui/android/ui_jni_registrar.cc
index 4cfc267eeacfd1aee95e2ef4ed8423d752181fd5..8019d64fc134c2c9404482e1e355483680ac9a5b 100644
--- a/ui/android/ui_jni_registrar.cc
+++ b/ui/android/ui_jni_registrar.cc
@@ -7,13 +7,18 @@
#include "base/android/jni_android.h"
#include "base/android/jni_registrar.h"
#include "ui/base/dialogs/select_file_dialog_android.h"
+#include "ui/gfx/android/device_display_info.h"
+#include "ui/gfx/android/java_bitmap.h"
#include "ui/gfx/android/window_android.h"
namespace ui {
+namespace android {
static base::android::RegistrationMethod kUiRegisteredMethods[] = {
- { "NativeWindow", WindowAndroid::RegisterWindowAndroid },
- { "SelectFileDialog", SelectFileDialogImpl::RegisterSelectFileDialog },
+ { "DeviceDisplayInfo", gfx::DeviceDisplayInfo::RegisterDeviceDisplayInfo },
+ { "JavaBitmap", gfx::JavaBitmap::RegisterJavaBitmap },
+ { "NativeWindow", ui::WindowAndroid::RegisterWindowAndroid },
+ { "SelectFileDialog", ui::SelectFileDialogImpl::RegisterSelectFileDialog },
};
bool RegisterJni(JNIEnv* env) {
@@ -21,4 +26,5 @@ bool RegisterJni(JNIEnv* env) {
arraysize(kUiRegisteredMethods));
}
-} // namespace ui
+} // namespace android
+} // namespace ui
« no previous file with comments | « ui/android/ui_jni_registrar.h ('k') | ui/base/layout.h » ('j') | ui/base/layout.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698