Add a handler for enabled/disabling assist.

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
index 117b21845282f7fbb48564e0a2cf38b31b308e00..f6add7fb1f9d415a765c886be7ba13ae8a2596ad 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -199,6 +199,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
 
     private final Locale mCurrentLocale = Locale.getDefault();
 
+    private AssistStatusHandler mAssistStatusHandler;
+
     @Override
     public void preInflationStartup() {
         super.preInflationStartup();
@@ -218,6 +220,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
         mSnackbarManager = new SnackbarManager(getWindow());
         mLoFiBarPopupController = new LoFiBarPopupController(this, getSnackbarManager());
 
+        mAssistStatusHandler = createAssistStatusHandler();
+        if (mAssistStatusHandler != null) {
+            if (mTabModelSelector != null) {
+                mAssistStatusHandler.setTabModelSelector(mTabModelSelector);
+            }
+            mAssistStatusHandler.updateAssistState();
+        }
+
         // Low end device UI should be allowed only after a fresh install or when the data has
         // been cleared. This must happen before anyone calls SysUtils.isLowEndDevice() or
         // SysUtils.isLowEndDevice() will always return the wrong value.
@@ -357,6 +367,20 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
     }
 
     /**
+     * @return The assist handler for this activity.
+     */
+    protected AssistStatusHandler getAssistStatusHandler() {
+        return mAssistStatusHandler;
+    }
+
+    /**
+     * @return A newly constructed assist handler for this given activity type.
+     */
+    protected AssistStatusHandler createAssistStatusHandler() {
+        return new AssistStatusHandler(this);
+    }
+
+    /**
      * @return The resource id for the layout to use for {@link ControlContainer}. 0 by default.
      */
     protected int getControlContainerLayoutId() {
@@ -455,6 +479,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
                 postDeferredStartupIfNeeded();
             }
         };
+
+        if (mAssistStatusHandler != null) {
+            mAssistStatusHandler.setTabModelSelector(tabModelSelector);
+        }
     }
 
     @Override