Chromium Code Reviews| 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..bdcd294654e837985a757c0e4f54a6d5a8811741 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,23 @@ 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); |
|
Ted C
2016/07/27 20:10:47
do we need to do something like this for the view?
Jinsuk Kim
2016/07/29 06:09:14
The anchor view does not need positioning since it
|
| 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) { |
|
Ted C
2016/07/27 20:10:47
this can all fit on a single line (and is valid in
Jinsuk Kim
2016/07/29 06:09:14
Done.
|
| + return; |
| + } |
| View anchorView = mKeepScreenOnView.get(); |
| mKeepScreenOnView = null; |
| if (anchorView == null) return; |
| anchorView.setKeepScreenOn(false); |
| - delegate.releaseAnchorView(anchorView); |
| } |
| } |