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

Unified Diff: device/power_save_blocker/android/java/src/org/chromium/device/power_save_blocker/PowerSaveBlocker.java

Issue 2103243002: Factor out ContentViewAndroidDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 4 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/android/java/src/org/chromium/device/power_save_blocker/PowerSaveBlocker.java
diff --git a/device/power_save_blocker/android/java/src/org/chromium/device/power_save_blocker/PowerSaveBlocker.java b/device/power_save_blocker/android/java/src/org/chromium/device/power_save_blocker/PowerSaveBlocker.java
index 3638d98071e6e51afe80efc1da5ab0e9fa2f7028..c29dfe32eb80650bf604b936c3918272af42eb35 100644
--- a/device/power_save_blocker/android/java/src/org/chromium/device/power_save_blocker/PowerSaveBlocker.java
+++ b/device/power_save_blocker/android/java/src/org/chromium/device/power_save_blocker/PowerSaveBlocker.java
@@ -8,7 +8,6 @@ import android.view.View;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
-import org.chromium.ui.base.ViewAndroidDelegate;
import java.lang.ref.WeakReference;
@@ -25,22 +24,21 @@ class PowerSaveBlocker {
private PowerSaveBlocker() {}
@CalledByNative
- private void applyBlock(ViewAndroidDelegate delegate) {
+ private void applyBlock(View anchorView) {
assert mKeepScreenOnView == null;
- View anchorView = delegate.acquireAnchorView();
mKeepScreenOnView = new WeakReference<>(anchorView);
- delegate.setAnchorViewPosition(anchorView, 0, 0, 0, 0);
anchorView.setKeepScreenOn(true);
}
@CalledByNative
- private void removeBlock(ViewAndroidDelegate delegate) {
- assert mKeepScreenOnView != null;
+ private void removeBlock() {
+ // mKeepScreenOnView may be null since it's possible that |applyBlock()|
+ // was not invoked due to having failed to acquire an anchor view.
+ if (mKeepScreenOnView == null) return;
View anchorView = mKeepScreenOnView.get();
mKeepScreenOnView = null;
if (anchorView == null) return;
anchorView.setKeepScreenOn(false);
- delegate.releaseAnchorView(anchorView);
}
}

Powered by Google App Engine
This is Rietveld 408576698