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

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: 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
« no previous file with comments | « ui/android/ui_jni_registrar.h ('k') | ui/base/layout.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/android/ui_jni_registrar.cc
diff --git a/ui/android/ui_jni_registrar.cc b/ui/android/ui_jni_registrar.cc
index 9ea0ef4eb2259cfe82a9ec397b2ebd6a8224ec00..11daf36b56278575e8021cc05e0c53be5b265315 100644
--- a/ui/android/ui_jni_registrar.cc
+++ b/ui/android/ui_jni_registrar.cc
@@ -6,14 +6,19 @@
#include "base/android/jni_android.h"
#include "base/android/jni_registrar.h"
+#include "ui/gfx/android/device_display_info.h"
+#include "ui/gfx/android/java_bitmap.h"
#include "ui/gfx/android/window_android.h"
#include "ui/shell_dialogs/select_file_dialog_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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698