Record NTP.LogoShownTime for timely refreshs only

chrome/browser/android/logo_bridge.cc

 // 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.
 
 #include "chrome/browser/android/logo_bridge.h"
 
 #include <jni.h>
 #include <stdint.h>
 
 #include "base/android/jni_android.h"
@@ skipping 208 matching lines @@
 void LogoBridge::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
 void LogoBridge::GetCurrentLogo(JNIEnv* env,
                                 const JavaParamRef<jobject>& obj,
                                 const JavaParamRef<jobject>& j_logo_observer) {
   if (doodle_service_) {
     j_logo_observer_.Reset(j_logo_observer);
 
     // Immediately hand out any current cached config.

[Marc Treib, 2017/04/27 15:22:55]

nit: I'd remove the "Immediately", since it has already confused us - this does
*not* mean the Java callback will get called immediately.

[fhorschig, 2017/04/28 08:20:07]

Done.

-    DoodleConfigReceived(doodle_service_->config(), /*from_cache=*/true);
-    // Also request a refresh, in case something changed.
+    if (doodle_service_->config().has_value()) {
+      FetchDoodleImage(doodle_service_->config().value(), /*from_cache=*/true);
+    }
+    // Also request a refresh, in case something changed. Depending on whether a
+    // newer config was available, either |OnDoodleConfigUpdated| or
+    // |OnDoodleConfigRevalidated| are called.
     doodle_service_->Refresh();
   } else {
     // |observer| is deleted in LogoObserverAndroid::OnObserverRemoved().
     LogoObserverAndroid* observer = new LogoObserverAndroid(
         weak_ptr_factory_.GetWeakPtr(), env, j_logo_observer);
     logo_service_->GetLogo(observer);
   }
 }
 
 void LogoBridge::GetAnimatedLogo(JNIEnv* env,
                                  const JavaParamRef<jobject>& obj,
                                  const JavaParamRef<jobject>& j_callback,
                                  const JavaParamRef<jstring>& j_url) {
   GURL url = GURL(ConvertJavaStringToUTF8(env, j_url));
   animated_logo_fetcher_->Start(env, url, j_callback);
 }
 
+void LogoBridge::OnDoodleConfigRevalidated(bool from_cache) {
+  if (j_logo_observer_.is_null()) {
+    return;
+  }
+  // If an existing config got re-validated, there's nothing to do - the UI is
+  // already in the correct state. However, we do tell the UI when we validate
+  // that there really isn't a Doodle. This is needed for metrics tracking.
+  if (!doodle_service_->config().has_value()) {
+    NotifyNoLogoAvailable(from_cache);
+  }
+}
+
 void LogoBridge::OnDoodleConfigUpdated(
     const base::Optional<doodle::DoodleConfig>& maybe_doodle_config) {
   if (j_logo_observer_.is_null()) {
     return;
   }
-  DoodleConfigReceived(maybe_doodle_config, /*from_cache=*/false);
+  if (!maybe_doodle_config.has_value()) {
+    NotifyNoLogoAvailable(/*from_cache=*/false);
+    return;
+  }
+  FetchDoodleImage(maybe_doodle_config.value(), /*from_cache=*/false);
 }
 
-void LogoBridge::DoodleConfigReceived(
-    const base::Optional<doodle::DoodleConfig>& maybe_doodle_config,
-    bool from_cache) {
+void LogoBridge::NotifyNoLogoAvailable(bool from_cache) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_LogoObserver_onLogoAvailable(env, j_logo_observer_,
+                                    ScopedJavaLocalRef<jobject>(), from_cache);
+}
+
+void LogoBridge::FetchDoodleImage(const doodle::DoodleConfig& doodle_config,
+                                  bool from_cache) {
   DCHECK(!j_logo_observer_.is_null());
 
-  if (!maybe_doodle_config.has_value()) {
-    JNIEnv* env = base::android::AttachCurrentThread();
-    Java_LogoObserver_onLogoAvailable(
-        env, j_logo_observer_, ScopedJavaLocalRef<jobject>(), from_cache);
-    return;
-  }
-  const doodle::DoodleConfig& doodle_config = maybe_doodle_config.value();
   // If there is a CTA image, that means the main image is animated. Show the
   // non-animated CTA image first, and load the animated one only when the
   // user requests it.
   bool has_cta = doodle_config.large_cta_image.has_value();
   const GURL& image_url = has_cta ? doodle_config.large_cta_image->url
                                   : doodle_config.large_image.url;
   const GURL& animated_image_url =
       has_cta ? doodle_config.large_image.url : GURL::EmptyGURL();
   // TODO(treib): For interactive doodles, use |fullpage_interactive_url|
   // instead of |target_url|?
@@ skipping 29 matching lines @@
   ScopedJavaLocalRef<jobject> j_logo = MakeJavaLogo(
       env, image.ToSkBitmap(), on_click_url, alt_text, animated_image_url);
   Java_LogoObserver_onLogoAvailable(env, j_logo_observer_, j_logo,
                                     config_from_cache);
 }
 
 // static
 bool RegisterLogoBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }