Upstreaming AppMenu.

chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellToolbar.java

Index: chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellToolbar.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellToolbar.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellToolbar.java
index 168939b7a2759bc5a826c45eb44230af7a3c23d4..f84abda522dba10bf8fd214298848b84a80d4f65 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellToolbar.java
+++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellToolbar.java
@@ -6,11 +6,9 @@ package org.chromium.chrome.testshell;
 
 import android.content.Context;
 import android.graphics.drawable.ClipDrawable;
-import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
@@ -19,10 +17,10 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
+import org.chromium.chrome.browser.EmptyTabObserver;
 import org.chromium.chrome.browser.TabBase;
 import org.chromium.chrome.browser.TabObserver;
-import org.chromium.chrome.browser.EmptyTabObserver;
-import org.chromium.content.browser.LoadUrlParams;
+import org.chromium.chrome.browser.appmenu.AppMenuHandler;
 
 /**
  * A Toolbar {@link View} that shows the URL and navigation buttons.
@@ -30,7 +28,7 @@ import org.chromium.content.browser.LoadUrlParams;
 public class TestShellToolbar extends LinearLayout {
     private static final long COMPLETED_PROGRESS_TIMEOUT_MS = 200;
 
-    private Runnable mClearProgressRunnable = new Runnable() {
+    private final Runnable mClearProgressRunnable = new Runnable() {
         @Override
         public void run() {
             mProgressDrawable.setLevel(0);
@@ -38,14 +36,12 @@ public class TestShellToolbar extends LinearLayout {
     };
 
     private EditText mUrlTextView;
-    private ImageButton mPrevButton;
-    private ImageButton mNextButton;
 
     private ClipDrawable mProgressDrawable;
 
     private TestShellTab mTab;
-    private TabObserver mTabObserver = new TabObserverImpl();
-    private MenuHandler mMenuHandler;
+    private final TabObserver mTabObserver = new TabObserverImpl();
+    private AppMenuHandler mMenuHandler;
 
     /**
      * @param context The Context the view is running in.
@@ -82,11 +78,10 @@ public class TestShellToolbar extends LinearLayout {
 
         mProgressDrawable = (ClipDrawable) findViewById(R.id.toolbar).getBackground();
         initializeUrlField();
-        initializeNavigationButtons();
         initializeMenuButton();
     }
 
-    public void setMenuHandler(MenuHandler menuHandler) {
+    public void setMenuHandler(AppMenuHandler menuHandler) {
         mMenuHandler = menuHandler;
     }
 
@@ -112,8 +107,6 @@ public class TestShellToolbar extends LinearLayout {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
                 setKeyboardVisibilityForUrl(hasFocus);
-                mNextButton.setVisibility(hasFocus ? GONE : VISIBLE);
-                mPrevButton.setVisibility(hasFocus ? GONE : VISIBLE);
                 if (!hasFocus) {
                     mUrlTextView.setText(mTab.getContentView().getUrl());
                 }
@@ -121,30 +114,12 @@ public class TestShellToolbar extends LinearLayout {
         });
     }
 
-    private void initializeNavigationButtons() {
-        mPrevButton = (ImageButton) findViewById(R.id.prev);
-        mPrevButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View arg0) {
-                if (mTab.canGoBack()) mTab.goBack();
-            }
-        });
-
-        mNextButton = (ImageButton) findViewById(R.id.next);
-        mNextButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mTab.canGoForward()) mTab.goForward();
-            }
-        });
-    }
-
     private void initializeMenuButton() {
         ImageButton menuButton = (ImageButton) findViewById(R.id.menu_button);
         menuButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (mMenuHandler != null) mMenuHandler.showPopupMenu();
+                if (mMenuHandler != null) mMenuHandler.showAppMenu(v, false, false);
             }
         });
     }