Follow up CL for issue:541713002

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 ImageButton mStopButton;
-    private ImageButton mReloadButton;
+    private ImageButton mStopReloadButton;
+    private boolean mLoading;
 
     /**
      * @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.
@@ skipping 16 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);
-        boolean isLoading = progress != 100;
-        mStopButton.setVisibility(isLoading ? VISIBLE : GONE);
-        mReloadButton.setVisibility(isLoading ? GONE : VISIBLE);
-        if (!isLoading) postDelayed(mClearProgressRunnable, COMPLETED_PROGRESS_TIMEOUT_MS);
+        mLoading = progress != 100;
+        if (mLoading) mStopReloadButton.setImageResource(R.drawable.btn_stop_normal);

[Bernhard Bauer, 2014/09/08 07:58:42]

If one branch of if-else uses braces, the other one should too.

[ankit, 2014/09/08 09:23:08]

Done.

+        else {
+            mStopReloadButton.setImageResource(R.drawable.btn_reload_normal);
+            postDelayed(mClearProgressRunnable, COMPLETED_PROGRESS_TIMEOUT_MS);
+        }
     }
 
     /**
      * Closes the suggestion popup.
      */
     public void hideSuggestions() {
         if (mSuggestionPopup != null) mSuggestionPopup.hideSuggestions();
     }
 
     @Override
@@ skipping 68 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() {
+        mStopReloadButton = (ImageButton)findViewById(R.id.stop_reload_button);
+        mStopReloadButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                mTab.getContentViewCore().stopLoading();
-            }
-        });
-        mReloadButton = (ImageButton)findViewById(R.id.reload);
-        mReloadButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mTab.getContentViewCore().reload(true);
+                if (mLoading) mTab.getContentViewCore().stopLoading();

[Bernhard Bauer, 2014/09/08 07:58:42]

Putting the if-statement and the body on the same line is only allowed if
everything fits on one line. Here it doesn't, because there's also the
else-statement. You'll have to use braces and separate lines.

[ankit, 2014/09/08 09:23:08]

Done.

+                else mTab.getContentViewCore().reload(true);
             }
         });
     }
 
     /**
      * @return Current tab that is shown by ChromeShell.
      */
     public ChromeShellTab getCurrentTab() {
         return mTab;
     }
@@ skipping 23 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);
         }
     }
 }