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

Side by Side Diff: ui/android/ui_android_jni_registrar.cc

Issue 2416403002: Reland of Android: support multiple displays on C++ side (Closed)
Patch Set: Rebased and fixed webkit_tests Created 4 years 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
« no previous file with comments | « ui/android/screen_android.h ('k') | ui/android/window_android.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_android_jni_registrar.h" 5 #include "ui/android/ui_android_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 "base/macros.h" 9 #include "base/macros.h"
10 #include "ui/android/resources/resource_manager_impl.h" 10 #include "ui/android/resources/resource_manager_impl.h"
11 #include "ui/android/screen_android.h"
11 #include "ui/android/view_android.h" 12 #include "ui/android/view_android.h"
12 #include "ui/android/window_android.h" 13 #include "ui/android/window_android.h"
13 14
14 namespace ui { 15 namespace ui {
15 16
16 static base::android::RegistrationMethod kAndroidRegisteredMethods[] = { 17 static base::android::RegistrationMethod kAndroidRegisteredMethods[] = {
18 {"DisplayAndroidManager", ui::RegisterScreenAndroid},
17 {"ResourceManager", ui::ResourceManagerImpl::RegisterResourceManager}, 19 {"ResourceManager", ui::ResourceManagerImpl::RegisterResourceManager},
18 {"WindowAndroid", WindowAndroid::RegisterWindowAndroid}, 20 {"WindowAndroid", WindowAndroid::RegisterWindowAndroid},
19 }; 21 };
20 22
21 bool RegisterUIAndroidJni(JNIEnv* env) { 23 bool RegisterUIAndroidJni(JNIEnv* env) {
22 return RegisterNativeMethods(env, kAndroidRegisteredMethods, 24 return RegisterNativeMethods(env, kAndroidRegisteredMethods,
23 arraysize(kAndroidRegisteredMethods)); 25 arraysize(kAndroidRegisteredMethods));
24 } 26 }
25 27
26 } // namespace ui 28 } // namespace ui
OLDNEW
« no previous file with comments | « ui/android/screen_android.h ('k') | ui/android/window_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698