| Index: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
|
| index ed0bc3c71ce1d32da7413075e15f9a9f9cac92cf..07c99f601651e750e97db5f1d51c46ab58dca170 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
|
| @@ -97,7 +97,6 @@
|
| import org.chromium.content_public.browser.LoadUrlParams;
|
| import org.chromium.content_public.browser.WebContents;
|
| import org.chromium.content_public.common.BrowserControlsState;
|
| -import org.chromium.content_public.common.BrowserControlsState.BrowserControlsStateEnum;
|
| import org.chromium.content_public.common.Referrer;
|
| import org.chromium.content_public.common.ResourceRequestBody;
|
| import org.chromium.printing.PrintManagerDelegateImpl;
|
| @@ -2534,9 +2533,8 @@ public void updateFullscreenEnabledState() {
|
| * @param animate Whether the controls should animate to the specified ending condition or
|
| * should jump immediately.
|
| */
|
| - protected void updateBrowserControlsState(
|
| - @BrowserControlsStateEnum int constraints,
|
| - @BrowserControlsStateEnum int current, boolean animate) {
|
| + protected void updateBrowserControlsState(@BrowserControlsState int constraints,
|
| + @BrowserControlsState int current, boolean animate) {
|
| if (mNativeTabAndroid == 0) return;
|
| nativeUpdateBrowserControlsState(mNativeTabAndroid, constraints, current, animate);
|
| }
|
| @@ -2597,7 +2595,7 @@ public boolean isShowingBrowserControlsEnabled() {
|
| * @return The current visibility constraints for the display of browser controls.
|
| * {@link BrowserControlsState} defines the valid return options.
|
| */
|
| - @BrowserControlsStateEnum
|
| + @BrowserControlsState
|
| public int getBrowserControlsStateConstraints() {
|
| int constraints = BrowserControlsState.BOTH;
|
| if (!isShowingBrowserControlsEnabled()) {
|
|
|