| 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/base/android/window_android.h" |   5 #include "ui/base/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_helper.h" |   9 #include "base/android/jni_helper.h" | 
|  10 #include "base/android/scoped_java_ref.h" |  10 #include "base/android/scoped_java_ref.h" | 
|  11 #include "jni/WindowAndroid_jni.h" |  11 #include "jni/WindowAndroid_jni.h" | 
 |  12 #include "ui/base/android/window_android_observer.h" | 
|  12  |  13  | 
|  13 namespace ui { |  14 namespace ui { | 
|  14  |  15  | 
|  15 using base::android::AttachCurrentThread; |  16 using base::android::AttachCurrentThread; | 
|  16 using base::android::ScopedJavaLocalRef; |  17 using base::android::ScopedJavaLocalRef; | 
|  17  |  18  | 
|  18 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj) |  19 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj) | 
|  19   : weak_java_window_(env, obj) { |  20   : weak_java_window_(env, obj) { | 
|  20 } |  21 } | 
|  21  |  22  | 
| (...skipping 21 matching lines...) Expand all  Loading... | 
|  43                                       content_x + content_offset_.x(), |  44                                       content_x + content_offset_.x(), | 
|  44                                       content_y + content_offset_.y(), |  45                                       content_y + content_offset_.y(), | 
|  45                                       width, height); |  46                                       width, height); | 
|  46   if (result.is_null()) |  47   if (result.is_null()) | 
|  47     return false; |  48     return false; | 
|  48   base::android::JavaByteArrayToByteVector( |  49   base::android::JavaByteArrayToByteVector( | 
|  49       env, result.obj(), png_representation); |  50       env, result.obj(), png_representation); | 
|  50   return true; |  51   return true; | 
|  51 } |  52 } | 
|  52  |  53  | 
 |  54 void WindowAndroid::OnCompositingDidCommit() { | 
 |  55   FOR_EACH_OBSERVER(WindowAndroidObserver, | 
 |  56                     observer_list_, | 
 |  57                     OnCompositingDidCommit()); | 
 |  58 } | 
 |  59  | 
 |  60 void WindowAndroid::AddObserver(WindowAndroidObserver* observer) { | 
 |  61   if (!observer_list_.HasObserver(observer)) | 
 |  62     observer_list_.AddObserver(observer); | 
 |  63 } | 
 |  64  | 
 |  65 void WindowAndroid::RemoveObserver(WindowAndroidObserver* observer) { | 
 |  66   observer_list_.RemoveObserver(observer); | 
 |  67 } | 
 |  68  | 
|  53 // ---------------------------------------------------------------------------- |  69 // ---------------------------------------------------------------------------- | 
|  54 // Native JNI methods |  70 // Native JNI methods | 
|  55 // ---------------------------------------------------------------------------- |  71 // ---------------------------------------------------------------------------- | 
|  56  |  72  | 
|  57 jlong Init(JNIEnv* env, jobject obj) { |  73 jlong Init(JNIEnv* env, jobject obj) { | 
|  58   WindowAndroid* window = new WindowAndroid(env, obj); |  74   WindowAndroid* window = new WindowAndroid(env, obj); | 
|  59   return reinterpret_cast<intptr_t>(window); |  75   return reinterpret_cast<intptr_t>(window); | 
|  60 } |  76 } | 
|  61  |  77  | 
|  62 }  // namespace ui |  78 }  // namespace ui | 
| OLD | NEW |