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

Side by Side 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 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 "ui/android/ui_jni_registrar.h" 5 #include "ui/android/ui_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 "ui/base/dialogs/select_file_dialog_android.h" 9 #include "ui/base/dialogs/select_file_dialog_android.h"
10 #include "ui/gfx/android/device_display_info.h"
11 #include "ui/gfx/android/java_bitmap.h"
10 #include "ui/gfx/android/window_android.h" 12 #include "ui/gfx/android/window_android.h"
11 13
12 namespace ui { 14 namespace ui {
15 namespace android {
13 16
14 static base::android::RegistrationMethod kUiRegisteredMethods[] = { 17 static base::android::RegistrationMethod kUiRegisteredMethods[] = {
15 { "NativeWindow", WindowAndroid::RegisterWindowAndroid }, 18 { "DeviceDisplayInfo", gfx::DeviceDisplayInfo::RegisterDeviceDisplayInfo },
16 { "SelectFileDialog", SelectFileDialogImpl::RegisterSelectFileDialog }, 19 { "JavaBitmap", gfx::JavaBitmap::RegisterJavaBitmap },
20 { "NativeWindow", ui::WindowAndroid::RegisterWindowAndroid },
21 { "SelectFileDialog", ui::SelectFileDialogImpl::RegisterSelectFileDialog },
17 }; 22 };
18 23
19 bool RegisterJni(JNIEnv* env) { 24 bool RegisterJni(JNIEnv* env) {
20 return RegisterNativeMethods(env, kUiRegisteredMethods, 25 return RegisterNativeMethods(env, kUiRegisteredMethods,
21 arraysize(kUiRegisteredMethods)); 26 arraysize(kUiRegisteredMethods));
22 } 27 }
23 28
24 } // namespace ui 29 } // namespace android
30 } // namespace ui
OLDNEW
« 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