Index: device/power_save_blocker/power_save_blocker_android.cc |
diff --git a/device/power_save_blocker/power_save_blocker_android.cc b/device/power_save_blocker/power_save_blocker_android.cc |
index 252ff02d6f71d0bb83a032ed708a1e7d95227547..a4eee3201c6571e6fec24264b9772a0b9e850bc5 100644 |
--- a/device/power_save_blocker/power_save_blocker_android.cc |
+++ b/device/power_save_blocker/power_save_blocker_android.cc |
@@ -34,6 +34,8 @@ class PowerSaveBlocker::Delegate |
base::android::ScopedJavaGlobalRef<jobject> java_power_save_blocker_; |
+ std::unique_ptr<ui::ViewAndroid::ScopedAnchorView> anchor_view_; |
+ |
scoped_refptr<base::SequencedTaskRunner> ui_task_runner_; |
DISALLOW_COPY_AND_ASSIGN(Delegate); |
@@ -53,21 +55,18 @@ void PowerSaveBlocker::Delegate::ApplyBlock() { |
DCHECK(ui_task_runner_->RunsTasksOnCurrentThread()); |
ScopedJavaLocalRef<jobject> obj(java_power_save_blocker_); |
- JNIEnv* env = AttachCurrentThread(); |
if (view_android_) { |
- Java_PowerSaveBlocker_applyBlock( |
- env, obj.obj(), view_android_->GetViewAndroidDelegate().obj()); |
+ anchor_view_.reset(view_android_->AcquireAnchorView()); |
+ JNIEnv* env = AttachCurrentThread(); |
no sievers
2016/07/18 22:14:16
I think you should handle |anchor_view_.view_.is_n
Jinsuk Kim
2016/07/19 07:08:39
Done.
|
+ Java_PowerSaveBlocker_applyBlock(env, obj.obj(), anchor_view_->obj()); |
} |
} |
void PowerSaveBlocker::Delegate::RemoveBlock() { |
DCHECK(ui_task_runner_->RunsTasksOnCurrentThread()); |
ScopedJavaLocalRef<jobject> obj(java_power_save_blocker_); |
- JNIEnv* env = AttachCurrentThread(); |
- if (view_android_) { |
- Java_PowerSaveBlocker_removeBlock( |
- env, obj.obj(), view_android_->GetViewAndroidDelegate().obj()); |
- } |
+ Java_PowerSaveBlocker_removeBlock(AttachCurrentThread(), obj.obj()); |
no sievers
2016/07/18 22:14:16
It's possible that you fixed a corner case bug her
Jinsuk Kim
2016/07/19 07:08:39
:)
|
+ anchor_view_.reset(); |
} |
PowerSaveBlocker::PowerSaveBlocker( |