| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/display_android_manager.h" | 5 #include "ui/android/display_android_manager.h" |
| 6 | 6 |
| 7 #include <jni.h> | 7 #include <jni.h> |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
| 11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
| 12 #include "jni/DisplayAndroidManager_jni.h" | 12 #include "jni/DisplayAndroidManager_jni.h" |
| 13 #include "ui/android/screen_android.h" | 13 #include "ui/android/screen_android.h" |
| 14 #include "ui/android/view_android.h" |
| 14 #include "ui/android/window_android.h" | 15 #include "ui/android/window_android.h" |
| 15 #include "ui/display/display.h" | 16 #include "ui/display/display.h" |
| 16 | 17 |
| 17 namespace ui { | 18 namespace ui { |
| 18 | 19 |
| 19 using base::android::AttachCurrentThread; | 20 using base::android::AttachCurrentThread; |
| 20 using display::Display; | 21 using display::Display; |
| 21 using display::DisplayList; | 22 using display::DisplayList; |
| 22 | 23 |
| 23 void SetScreenAndroid() { | 24 void SetScreenAndroid() { |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 } | 112 } |
| 112 | 113 |
| 113 void DisplayAndroidManager::SetPrimaryDisplayId( | 114 void DisplayAndroidManager::SetPrimaryDisplayId( |
| 114 JNIEnv* env, | 115 JNIEnv* env, |
| 115 const base::android::JavaParamRef<jobject>& jobject, | 116 const base::android::JavaParamRef<jobject>& jobject, |
| 116 jint sdkDisplayId) { | 117 jint sdkDisplayId) { |
| 117 primary_display_id_ = sdkDisplayId; | 118 primary_display_id_ = sdkDisplayId; |
| 118 } | 119 } |
| 119 | 120 |
| 120 } // namespace ui | 121 } // namespace ui |
| OLD | NEW |