Adding option for Stop/Reload in location bar for chrome_shell.

chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.shell;
 
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.drawable.ClipDrawable;
 import android.util.AttributeSet;
@@ skipping 34 matching lines @@
     private ClipDrawable mProgressDrawable;
 
     private ChromeShellTab mTab;
     private final TabObserver mTabObserver;
 
     private AppMenuHandler mMenuHandler;
     private AppMenuButtonHelper mAppMenuButtonHelper;
 
     private SuggestionPopup mSuggestionPopup;
 
+    private boolean mLoading = false;
+    private ImageButton mStopButton;
+    private ImageButton mReloadButton;
+
     /**
      * @param context The Context the view is running in.
      * @param attrs   The attributes of the XML tag that is inflating the view.
      */
     public ChromeShellToolbar(Context context, AttributeSet attrs) {
         super(context, attrs);
         // When running performance benchmark, we don't want to observe the tab
         // invalidation which would interfere with browser's processing content
         // frame. See crbug.com/394976.
         if (CommandLine.getInstance().hasSwitch(
@@ skipping 15 matching lines @@
         mUrlTextView.setText(mTab.getContentViewCore().getUrl());
     }
 
     private void onUpdateUrl(String url) {
         mUrlTextView.setText(url);
     }
 
     private void onLoadProgressChanged(int progress) {
         removeCallbacks(mClearProgressRunnable);
         mProgressDrawable.setLevel(100 * progress);
-        if (progress == 100) postDelayed(mClearProgressRunnable, COMPLETED_PROGRESS_TIMEOUT_MS);
+        mLoading = progress == 100 ? false : true;

[Bernhard Bauer, 2014/09/04 13:17:35]

Don't use false and true in a ?: expression. Just invert the condition.

+        mStopButton.setVisibility(mLoading ? VISIBLE : GONE);
+        mReloadButton.setVisibility(mLoading ? GONE : VISIBLE);
+        if (!mLoading) postDelayed(mClearProgressRunnable, COMPLETED_PROGRESS_TIMEOUT_MS);
     }
 
     /**
      * Closes the suggestion popup.
      */
     public void hideSuggestions() {
         if (mSuggestionPopup != null) mSuggestionPopup.hideSuggestions();
     }
 
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
 
         mProgressDrawable = (ClipDrawable) findViewById(R.id.toolbar).getBackground();
         initializeUrlField();
         initializeMenuButton();
+        initializeStopReloadButton();
     }
 
     void setMenuHandler(AppMenuHandler menuHandler) {
         mMenuHandler = menuHandler;
         ImageButton menuButton = (ImageButton) findViewById(R.id.menu_button);
         mAppMenuButtonHelper = new AppMenuButtonHelper(menuButton, mMenuHandler);
     }
 
     private void initializeUrlField() {
         mUrlTextView = (EditText) findViewById(R.id.url);
@@ skipping 50 matching lines @@
             }
         });
         menuButton.setOnTouchListener(new OnTouchListener() {
             @Override
             public boolean onTouch(View view, MotionEvent event) {
                 return mAppMenuButtonHelper != null && mAppMenuButtonHelper.onTouch(view, event);
             }
         });
     }
 
+    private void initializeStopReloadButton() {
+        mStopButton = (ImageButton)findViewById(R.id.stop);
+        mStopButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mLoading) mTab.getContentViewCore().stopLoading();

[Bernhard Bauer, 2014/09/04 13:17:35]

Is the loading check actually necessary? The button shouldn't be visible if
we're not loading the page.

+            }
+        });
+        mReloadButton = (ImageButton)findViewById(R.id.reload);
+        mReloadButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mTab.getContentViewCore().reload(true);
+            }
+        });
+    }
+
     /**
      * @return Current tab that is shown by ChromeShell.
      */
     public ChromeShellTab getCurrentTab() {
         return mTab;
     }
 
     /**
      * Change the visibility of the software keyboard.
      * @param visible Whether the keyboard should be shown or hidden.
@@ skipping 19 matching lines @@
         public void onLoadProgressChanged(Tab tab, int progress) {
             if (tab == mTab) ChromeShellToolbar.this.onLoadProgressChanged(progress);
         }
 
         @Override
         public void onUpdateUrl(Tab tab, String url) {
             if (tab == mTab) ChromeShellToolbar.this.onUpdateUrl(url);
         }
     }
 }