| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/window_android.h" | 5 #include "ui/android/window_android.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
| 9 #include "base/android/jni_weak_ref.h" | 9 #include "base/android/jni_weak_ref.h" |
| 10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 } | 106 } |
| 107 | 107 |
| 108 void WindowAndroid::OnActivityResumed(JNIEnv* env, jobject obj) { | 108 void WindowAndroid::OnActivityResumed(JNIEnv* env, jobject obj) { |
| 109 FOR_EACH_OBSERVER(WindowAndroidObserver, observer_list_, OnActivityResumed()); | 109 FOR_EACH_OBSERVER(WindowAndroidObserver, observer_list_, OnActivityResumed()); |
| 110 } | 110 } |
| 111 | 111 |
| 112 void WindowAndroid::OnActivityPaused(JNIEnv* env, jobject obj) { | 112 void WindowAndroid::OnActivityPaused(JNIEnv* env, jobject obj) { |
| 113 FOR_EACH_OBSERVER(WindowAndroidObserver, observer_list_, OnActivityPaused()); | 113 FOR_EACH_OBSERVER(WindowAndroidObserver, observer_list_, OnActivityPaused()); |
| 114 } | 114 } |
| 115 | 115 |
| 116 const gfx::DeviceDisplayInfo & WindowAndroid::GetDeviceDisplayInfo() { |
| 117 if (!device_display_info_) { |
| 118 UpdateDeviceDisplayInfo(); |
| 119 } |
| 120 return *device_display_info_; |
| 121 } |
| 122 |
| 123 void WindowAndroid::UpdateDeviceDisplayInfo() |
| 124 { |
| 125 device_display_info_ = scoped_ptr<gfx::DeviceDisplayInfo>( |
| 126 new gfx::DeviceDisplayInfo(GetJavaContext())); |
| 127 } |
| 128 |
| 129 base::android::ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaContext() { |
| 130 JNIEnv* env = AttachCurrentThread(); |
| 131 return Java_WindowAndroid_getContext(env, GetJavaObject().obj()); |
| 132 } |
| 133 |
| 116 // ---------------------------------------------------------------------------- | 134 // ---------------------------------------------------------------------------- |
| 117 // Native JNI methods | 135 // Native JNI methods |
| 118 // ---------------------------------------------------------------------------- | 136 // ---------------------------------------------------------------------------- |
| 119 | 137 |
| 120 jlong Init(JNIEnv* env, jobject obj) { | 138 jlong Init(JNIEnv* env, jobject obj) { |
| 121 WindowAndroid* window = new WindowAndroid(env, obj); | 139 WindowAndroid* window = new WindowAndroid(env, obj); |
| 122 return reinterpret_cast<intptr_t>(window); | 140 return reinterpret_cast<intptr_t>(window); |
| 123 } | 141 } |
| 124 | 142 |
| 125 } // namespace ui | 143 } // namespace ui |
| OLD | NEW |