Force standard progress bar colors if native page

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

 // Copyright 2015 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.browser.toolbar;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ skipping 1969 matching lines @@
                 && isVisualStateValidForBrandColorTransition(newVisualState)) {
             return;
         } else if (mBrandColorTransitionAnimation != null
                 && mBrandColorTransitionAnimation.isRunning()) {
             mBrandColorTransitionAnimation.cancel();
         }
 
         boolean visualStateChanged = mVisualState != newVisualState;
 
         int currentPrimaryColor = getToolbarDataProvider().getPrimaryColor();
+        int themeColorForProgressBar = currentPrimaryColor;
+
+        // If The page is native force the use of the standard theme for the progress bar.
+        if (getToolbarDataProvider() != null && getToolbarDataProvider().getTab() != null
+                && getToolbarDataProvider().getTab().isNativePage()) {
+            themeColorForProgressBar = getToolbarColorForVisualState(VisualState.NORMAL);

[Ted C, 2016/06/24 16:19:06]

What happens if you're on the incognito ntp?

[mdjones, 2016/06/24 17:05:28]

The incognito flag is still passed into the function that computes theme color,
so it should still work.

[Ted C, 2016/06/24 17:35:43]

Acknowledged.

+        }
+
         if (mVisualState == VisualState.BRAND_COLOR && !visualStateChanged) {
             boolean useLightToolbarDrawables =
                     ColorUtils.shouldUseLightForegroundOnBackground(currentPrimaryColor);
             boolean unfocusedLocationBarUsesTransparentBg =
                     !ColorUtils.shouldUseOpaqueTextboxBackground(currentPrimaryColor);
             if (useLightToolbarDrawables != mUseLightToolbarDrawables
                     || unfocusedLocationBarUsesTransparentBg
                             != mUnfocusedLocationBarUsesTransparentBg) {
                 visualStateChanged = true;
             } else {
                 updateToolbarBackground(VisualState.BRAND_COLOR);
-                getProgressBar().setThemeColor(currentPrimaryColor, isIncognito());
+                getProgressBar().setThemeColor(themeColorForProgressBar, isIncognito());
             }
         }
 
         mVisualState = newVisualState;
 
         updateOverlayDrawables(isInTabSwitcherMode);
         updateShadowVisibility(isInTabSwitcherMode);
         if (!visualStateChanged) {
             if (mVisualState == VisualState.NEW_TAB_NORMAL) {
                 updateNtpTransitionAnimation(
                         getToolbarDataProvider().getNewTabPageForCurrentTab());
             }
             return;
         }
 
         mUseLightToolbarDrawables = false;
         mUnfocusedLocationBarUsesTransparentBg = false;
         mUrlBackgroundAlpha = 255;
         updateToolbarBackground(mVisualState);
-        getProgressBar().setThemeColor(currentPrimaryColor, isIncognito());
+        getProgressBar().setThemeColor(themeColorForProgressBar, isIncognito());
 
         if (isInTabSwitcherMode) {
             mUseLightToolbarDrawables = true;
             mUrlBackgroundAlpha = LOCATION_BAR_TRANSPARENT_BACKGROUND_ALPHA;
             getProgressBar().setBackgroundColor(mProgressBackBackgroundColorWhite);
             getProgressBar().setForegroundColor(ApiCompatibilityUtils.getColor(getResources(),
                     R.color.progress_bar_foreground_white));
         } else if (isIncognito()) {
             mUseLightToolbarDrawables = true;
             mUrlBackgroundAlpha = LOCATION_BAR_TRANSPARENT_BACKGROUND_ALPHA;
@@ skipping 177 matching lines @@
         });
 
         if (mFullscreenManager != null) {
             mFullscreenCalloutToken =
                     mFullscreenManager.showControlsPersistentAndClearOldToken(
                             mFullscreenCalloutToken);
         }
     }
 }