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

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: Comments added; GetWidth() renamed to GetDisplayWidth() etc. 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_info.h"
10 #include "ui/gfx/android/window_android.h" 11 #include "ui/gfx/android/window_android.h"
11 12
12 namespace ui { 13 namespace ui {
13 14
14 static base::android::RegistrationMethod kUiRegisteredMethods[] = { 15 static base::android::RegistrationMethod kUiRegisteredMethods[] = {
16 { "DeviceInfo", gfx::DeviceInfo::RegisterDeviceInfo },
15 { "NativeWindow", WindowAndroid::RegisterWindowAndroid }, 17 { "NativeWindow", WindowAndroid::RegisterWindowAndroid },
16 { "SelectFileDialog", SelectFileDialogImpl::RegisterSelectFileDialog }, 18 { "SelectFileDialog", SelectFileDialogImpl::RegisterSelectFileDialog },
17 }; 19 };
18 20
19 bool RegisterJni(JNIEnv* env) { 21 bool RegisterJni(JNIEnv* env) {
20 return RegisterNativeMethods(env, kUiRegisteredMethods, 22 return RegisterNativeMethods(env, kUiRegisteredMethods,
21 arraysize(kUiRegisteredMethods)); 23 arraysize(kUiRegisteredMethods));
22 } 24 }
23 25
24 } // namespace ui 26 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698