diff options
| author | bokan <bokan@chromium.org> | 2015-03-09 14:51:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-09 21:52:28 +0000 |
| commit | aa5d1b033c0894dfde32bfe0b1d2cd8b2d9a1eb3 (patch) | |
| tree | 84d3803e89ce24dae61fbf7cba858e1d1b06995b /content/public/android/java | |
| parent | a0bf8e711f92b7567e6ce3d6faba56825d36c13b (diff) | |
| download | chromium_src-aa5d1b033c0894dfde32bfe0b1d2cd8b2d9a1eb3.zip chromium_src-aa5d1b033c0894dfde32bfe0b1d2cd8b2d9a1eb3.tar.gz chromium_src-aa5d1b033c0894dfde32bfe0b1d2cd8b2d9a1eb3.tar.bz2 | |
(Reland) Always create top controls manager.
This CL removes the calculate_top_controls_position flag and instead
always creates the top controls manager. The methods of the manager
become no-ops if the top controls height is 0 so that it becomes
effectively enabled when a top controls height gets set.
This fixes the attached bug because some Android Chrome UI pages don't
have top controls but the manager was still created. These pages set
the height to 0 to hide the top controls but the methods of the
manager were still getting called. This caused a crash in Blink since
ScrollBy would try to calculate the shown ratio with a 0 height, causing
a NaN to propagate into Blink.
BUG=460007
Committed: https://crrev.com/7610e74eacde3468853c9765bd3f726c14df04c1
Cr-Commit-Position: refs/heads/master@{#319257}
Review URL: https://codereview.chromium.org/961023002
Cr-Commit-Position: refs/heads/master@{#319738}
Diffstat (limited to 'content/public/android/java')
| -rw-r--r-- | content/public/android/java/src/org/chromium/content/common/ContentSwitches.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/content/public/android/java/src/org/chromium/content/common/ContentSwitches.java b/content/public/android/java/src/org/chromium/content/common/ContentSwitches.java index 44a854c..a671db7 100644 --- a/content/public/android/java/src/org/chromium/content/common/ContentSwitches.java +++ b/content/public/android/java/src/org/chromium/content/common/ContentSwitches.java @@ -41,10 +41,6 @@ public abstract class ContentSwitches { // Sets the ISO country code that will be used for phone number detection. public static final String NETWORK_COUNTRY_ISO = "network-country-iso"; - // Whether to enable the auto-hiding top controls. - public static final String ENABLE_TOP_CONTROLS_POSITION_CALCULATION = - "enable-top-controls-position-calculation"; - // How much of the top controls need to be shown before they will auto show. public static final String TOP_CONTROLS_SHOW_THRESHOLD = "top-controls-show-threshold"; |