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

Unified Diff: device/power_save_blocker/power_save_blocker_android.cc

Issue 2638973004: Use ContainerView for PowerSaveBlocker to keep screen on (Closed)
Patch Set: fix tests/2 Created 3 years, 11 months 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 side-by-side diff with in-line comments
Download patch
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 4d6e3c574bee1d4cbbb043eae95e97b24924c5b2..c58903548de637b3f6c0b264f6cd81445e071c3d 100644
--- a/device/power_save_blocker/power_save_blocker_android.cc
+++ b/device/power_save_blocker/power_save_blocker_android.cc
@@ -32,8 +32,6 @@ class PowerSaveBlocker::Delegate
base::android::ScopedJavaGlobalRef<jobject> java_power_save_blocker_;
- ui::ViewAndroid::ScopedAnchorView anchor_view_;
-
scoped_refptr<base::SequencedTaskRunner> ui_task_runner_;
DISALLOW_COPY_AND_ASSIGN(Delegate);
@@ -52,21 +50,19 @@ void PowerSaveBlocker::Delegate::ApplyBlock(ui::ViewAndroid* view_android) {
DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
DCHECK(view_android);
- JNIEnv* env = AttachCurrentThread();
- anchor_view_ = view_android->AcquireAnchorView();
- const ScopedJavaLocalRef<jobject> popup_view = anchor_view_.view();
- if (popup_view.is_null())
- return;
- view_android->SetAnchorRect(popup_view, gfx::RectF());
ScopedJavaLocalRef<jobject> obj(java_power_save_blocker_);
- Java_PowerSaveBlocker_applyBlock(env, obj, popup_view);
+ ScopedJavaLocalRef<jobject> container_view(view_android->GetContainerView());
+ if (container_view.is_null())
+ return;
+
+ Java_PowerSaveBlocker_applyBlock(AttachCurrentThread(), obj, container_view);
}
void PowerSaveBlocker::Delegate::RemoveBlock() {
DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
+
ScopedJavaLocalRef<jobject> obj(java_power_save_blocker_);
Java_PowerSaveBlocker_removeBlock(AttachCurrentThread(), obj);
- anchor_view_.Reset();
}
PowerSaveBlocker::PowerSaveBlocker(

Powered by Google App Engine
This is Rietveld 408576698