Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java |
index fcbe1c0562e5bca573a81a4f209d0d449eb721be..0b602c840f51900de7cd385171f2556d8ebcc04e 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java |
@@ -8,7 +8,6 @@ import static org.chromium.chrome.browser.compositor.layouts.ChromeAnimation.Ani |
import android.content.Context; |
import android.content.res.Resources; |
-import android.os.Handler; |
import android.os.Message; |
import android.os.SystemClock; |
import android.support.annotation.StringRes; |
@@ -25,6 +24,7 @@ import org.chromium.base.PerfTraceEvent; |
import org.chromium.base.VisibleForTesting; |
import org.chromium.base.annotations.SuppressFBWarnings; |
import org.chromium.chrome.R; |
+import org.chromium.chrome.browser.TidyHandler; |
import org.chromium.chrome.browser.compositor.layouts.ChromeAnimation; |
import org.chromium.chrome.browser.compositor.layouts.ChromeAnimation.Animatable; |
import org.chromium.chrome.browser.compositor.layouts.ChromeAnimation.Animation; |
@@ -109,7 +109,7 @@ public class StripLayoutHelper { |
private StripLayoutTab[] mStripTabs = new StripLayoutTab[0]; |
private StripLayoutTab[] mStripTabsVisuallyOrdered = new StripLayoutTab[0]; |
private StripLayoutTab[] mStripTabsToRender = new StripLayoutTab[0]; |
- private final StripTabEventHandler mStripTabEventHandler = new StripTabEventHandler(); |
+ private final StripTabEventHandler mStripTabEventHandler = new StripTabEventHandler(this); |
private final TabLoadTrackerCallback mTabLoadTrackerHost = new TabLoadTrackerCallbackImpl(); |
private ChromeAnimation<Animatable<?>> mLayoutAnimations; |
@@ -1506,16 +1506,21 @@ public class StripLayoutHelper { |
} |
} |
- private class StripTabEventHandler extends Handler { |
+ private static class StripTabEventHandler extends TidyHandler<StripLayoutHelper> { |
+ |
+ public StripTabEventHandler(StripLayoutHelper instance) { |
+ super(instance); |
+ } |
+ |
@Override |
- public void handleMessage(Message m) { |
+ public void handleMessage(Message m, StripLayoutHelper instance) { |
switch (m.what) { |
case MESSAGE_RESIZE: |
- computeAndUpdateTabWidth(true); |
- mUpdateHost.requestUpdate(); |
+ instance.computeAndUpdateTabWidth(true); |
+ instance.mUpdateHost.requestUpdate(); |
break; |
case MESSAGE_UPDATE_SPINNER: |
- mUpdateHost.requestUpdate(); |
+ instance.mUpdateHost.requestUpdate(); |
break; |
default: |
assert false : "StripTabEventHandler got unknown message " + m.what; |