Follow up CL for issue:541713002

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

Index: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java
index 1161c24ace81062bf0d71cfcdedf436e396268df..17cd9ba467b77c82b4b48377429a0bbd5c9197b7 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java
@@ -52,8 +52,8 @@ public class ChromeShellToolbar extends LinearLayout {
 
     private SuggestionPopup mSuggestionPopup;
 
-    private ImageButton mStopButton;
-    private ImageButton mReloadButton;
+    private ImageButton mStopReloadButton;
+    private boolean mLoading;
 
     /**
      * @param context The Context the view is running in.
@@ -90,10 +90,12 @@ public class ChromeShellToolbar extends LinearLayout {
     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);
+        }
     }
 
     /**
@@ -182,18 +184,12 @@ public class ChromeShellToolbar extends LinearLayout {
     }
 
     private void initializeStopReloadButton() {
-        mStopButton = (ImageButton)findViewById(R.id.stop);
-        mStopButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mTab.getContentViewCore().stopLoading();
-            }
-        });
-        mReloadButton = (ImageButton)findViewById(R.id.reload);
-        mReloadButton.setOnClickListener(new OnClickListener() {
+        mStopReloadButton = (ImageButton)findViewById(R.id.stop_reload_button);
+        mStopReloadButton.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);
             }
         });
     }