Fix theme colors not updating when navigating back/from the NTP.

chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.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.tab;
 
-import android.content.Context;
-import android.graphics.Color;
 import android.os.SystemClock;
 import android.support.annotation.IntDef;
 import android.view.View;
 
 import org.chromium.base.ActivityState;
 import org.chromium.base.ApplicationState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.Log;
 import org.chromium.base.ObserverList.RewindableIterator;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
 import org.chromium.chrome.browser.media.MediaCaptureNotificationService;
 import org.chromium.chrome.browser.metrics.UmaSessionStats;
 import org.chromium.chrome.browser.metrics.UmaUtils;
 import org.chromium.chrome.browser.policy.PolicyAuditor;
 import org.chromium.chrome.browser.policy.PolicyAuditor.AuditEvent;
-import org.chromium.components.security_state.ConnectionSecurityLevel;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.WebContentsObserver;
-import org.chromium.ui.base.DeviceFormFactor;
 
 import java.util.concurrent.TimeUnit;
 
 /**
  * WebContentsObserver used by Tab.
  */
 public class TabWebContentsObserver extends WebContentsObserver {
     // URL didFailLoad error code. Should match the value in net_error_list.h.
     public static final int BLOCKED_BY_ADMINISTRATOR = -22;
 
@@ skipping 18 matching lines @@
     private @interface TabRendererExitStatus {}
     private static final int TAB_RENDERER_EXIT_STATUS_OOM_PROTECTED_IN_RUNNING_APP = 0;
     private static final int TAB_RENDERER_EXIT_STATUS_OOM_PROTECTED_IN_PAUSED_APP = 1;
     private static final int TAB_RENDERER_EXIT_STATUS_OOM_PROTECTED_IN_BACKGROUND_APP = 2;
     private static final int TAB_RENDERER_EXIT_STATUS_NOT_PROTECTED_IN_RUNNING_APP = 3;
     private static final int TAB_RENDERER_EXIT_STATUS_NOT_PROTECTED_IN_PAUSED_APP = 4;
     private static final int TAB_RENDERER_EXIT_STATUS_NOT_PROTECTED_IN_BACKGROUND_APP = 5;
     private static final int TAB_RENDERER_EXIT_STATUS_MAX = 6;
 
     private final Tab mTab;
-    private int mThemeColor;
 
     public TabWebContentsObserver(WebContents webContents, Tab tab) {
         super(webContents);
         mTab = tab;
-        mThemeColor = mTab.getDefaultThemeColor();
     }
 
     @Override
     public void renderProcessGone(boolean processWasOomProtected) {
         Log.i(TAG, "renderProcessGone() for tab id: " + mTab.getId()
                 + ", oom protected: " + Boolean.toString(processWasOomProtected)
                 + ", already needs reload: " + Boolean.toString(mTab.needsReload()));
         // Do nothing for subsequent calls that happen while the tab remains crashed. This
         // can occur when the tab is in the background and it shares the renderer with other
         // tabs. After the renderer crashes, the WebContents of its tabs are still around
@@ skipping 176 matching lines @@
     @Override
     public void didFirstVisuallyNonEmptyPaint() {
         RewindableIterator<TabObserver> observers = mTab.getTabObservers();
         while (observers.hasNext()) {
             observers.next().didFirstVisuallyNonEmptyPaint(mTab);
         }
     }
 
     @Override
     public void didChangeThemeColor(int color) {
-        int securityLevel = mTab.getSecurityLevel();
-        if (securityLevel == ConnectionSecurityLevel.SECURITY_ERROR
-                || securityLevel == ConnectionSecurityLevel.SECURITY_WARNING
-                || securityLevel == ConnectionSecurityLevel.SECURITY_POLICY_WARNING) {
-            color = mTab.getDefaultThemeColor();
-        }
-        if (mTab.isShowingInterstitialPage()) color = mTab.getDefaultThemeColor();
-        if (!isThemeColorEnabled(mTab.getApplicationContext())) {
-            color = mTab.getDefaultThemeColor();
-        }
-        if (color == Color.TRANSPARENT) color = mTab.getDefaultThemeColor();
-        if (mTab.isIncognito()) color = mTab.getDefaultThemeColor();
-        color |= 0xFF000000;
-        if (mTab.getThemeColor() == color) return;
-        mThemeColor = color;
-        RewindableIterator<TabObserver> observers = mTab.getTabObservers();
-        while (observers.hasNext()) {
-            observers.next().onDidChangeThemeColor(mTab, mTab.getThemeColor());
-        }
+        mTab.updateThemeColorIfNeeded();
     }
 
     @Override
     public void didAttachInterstitialPage() {
         mTab.getInfoBarContainer().setVisibility(View.INVISIBLE);
         mTab.showRenderedPage();
-        didChangeThemeColor(mTab.getDefaultThemeColor());
+        mTab.updateThemeColorIfNeeded();
 
         RewindableIterator<TabObserver> observers = mTab.getTabObservers();
         while (observers.hasNext()) {
             observers.next().onDidAttachInterstitialPage(mTab);
         }
         mTab.notifyLoadProgress(mTab.getProgress());
 
         mTab.updateFullscreenEnabledState();
 
         PolicyAuditor auditor =
                 ((ChromeApplication) mTab.getApplicationContext()).getPolicyAuditor();
         auditor.notifyCertificateFailure(
                 PolicyAuditor.nativeGetCertificateFailure(mTab.getWebContents()),
                 mTab.getApplicationContext());
     }
 
     @Override
     public void didDetachInterstitialPage() {
         mTab.getInfoBarContainer().setVisibility(View.VISIBLE);
-        didChangeThemeColor(mTab.getWebContents().getThemeColor(mTab.getDefaultThemeColor()));
+        mTab.updateThemeColorIfNeeded();
 
         RewindableIterator<TabObserver> observers = mTab.getTabObservers();
         while (observers.hasNext()) {
             observers.next().onDidDetachInterstitialPage(mTab);
         }
         mTab.notifyLoadProgress(mTab.getProgress());
 
         mTab.updateFullscreenEnabledState();
 
         if (!mTab.maybeShowNativePage(mTab.getUrl(), false)) {
             mTab.showRenderedPage();
         }
     }
 
     @Override
     public void didStartNavigationToPendingEntry(String url) {
         RewindableIterator<TabObserver> observers = mTab.getTabObservers();
         while (observers.hasNext()) {
             observers.next().onDidStartNavigationToPendingEntry(mTab, url);
         }
     }
 
     @Override
     public void destroy() {
         MediaCaptureNotificationService.updateMediaNotificationForTab(
                 mTab.getApplicationContext(), mTab.getId(), false, false, mTab.getUrl());
         super.destroy();
     }
-
-    /**
-     * @return The theme-color for this web contents.
-     */
-    int getThemeColor() {
-        return mThemeColor;
-    }
-
-    private static boolean isThemeColorEnabled(Context context) {
-        return !DeviceFormFactor.isTablet(context);
-    }
 }