Make didChangeBrandColor available in TabObserver

BUG=381447

Review URL: https://codereview.chromium.org/345033002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278897 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 32 insertions, 0 deletions

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/EmptyTabObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/EmptyTabObserver.java
index d2d828b..0ee5470 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/EmptyTabObserver.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/EmptyTabObserver.java
@@ -61,4 +61,7 @@ public class EmptyTabObserver implements TabObserver {
     public void onDidStartProvisionalLoadForFrame(Tab tab, long frameId, long parentFrameId,
             boolean isMainFrame, String validatedUrl, boolean isErrorPage,
             boolean isIframeSrcdoc) { }
+
+    @Override
+    public void onDidChangeBrandColor(int color) { }
 }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
index 5263849..c3835b6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
@@ -281,6 +281,13 @@ public class Tab implements NavigationClient {
                         isMainFrame, validatedUrl, isErrorPage, isIframeSrcdoc);
             }
         }
+
+        @Override
+        public void didChangeBrandColor(int color) {
+            for (TabObserver observer : mObservers) {
+                observer.onDidChangeBrandColor(color);
+            }
+        }
     }
 
     /**
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java
index 9e93cfe..f48abad 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/TabObserver.java
@@ -143,4 +143,9 @@ public interface TabObserver {
             Tab tab, long frameId, long parentFrameId, boolean isMainFrame, String validatedUrl,
             boolean isErrorPage, boolean isIframeSrcdoc);
 
+    /**
+     * Called when the brand color is changed
+     * @param color the new color in ARGB format.
+     */
+    public void onDidChangeBrandColor(int color);
 }
diff --git a/content/browser/android/web_contents_observer_android.cc b/content/browser/android/web_contents_observer_android.cc
index a471028..803c579 100644
--- a/content/browser/android/web_contents_observer_android.cc
+++ b/content/browser/android/web_contents_observer_android.cc
@@ -264,6 +264,14 @@ void WebContentsObserverAndroid::DidDetachInterstitialPage() {
   Java_WebContentsObserverAndroid_didDetachInterstitialPage(env, obj.obj());
 }
 
+void WebContentsObserverAndroid::DidChangeBrandColor(SkColor color) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
+  if (obj.is_null())
+    return;
+  Java_WebContentsObserverAndroid_didChangeBrandColor(env, obj.obj(), color);
+}
+
 void WebContentsObserverAndroid::DidFailLoadInternal(
     bool is_provisional_load,
     bool is_main_frame,
diff --git a/content/browser/android/web_contents_observer_android.h b/content/browser/android/web_contents_observer_android.h
index dbae8c8..09b98b6 100644
--- a/content/browser/android/web_contents_observer_android.h
+++ b/content/browser/android/web_contents_observer_android.h
@@ -81,6 +81,7 @@ class WebContentsObserverAndroid : public WebContentsObserver {
   virtual void WebContentsDestroyed() OVERRIDE;
   virtual void DidAttachInterstitialPage() OVERRIDE;
   virtual void DidDetachInterstitialPage() OVERRIDE;
+  virtual void DidChangeBrandColor(SkColor color) OVERRIDE;
 
   void DidFailLoadInternal(bool is_provisional_load,
                            bool is_main_frame,
diff --git a/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java b/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
index 73a9f59..d37e50e 100644
--- a/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
+++ b/content/public/android/java/src/org/chromium/content/browser/WebContentsObserverAndroid.java
@@ -163,6 +163,14 @@ public abstract class WebContentsObserverAndroid {
     }
 
     /**
+     * Called when the brand color was changed.
+     * @param color the new color in ARGB format
+     */
+    @CalledByNative
+    public void didChangeBrandColor(int color) {
+    }
+
+    /**
      * Destroy the corresponding native object.
      */
     @CalledByNative