Record NTP.LogoShownTime for timely refreshs only

chrome/browser/android/logo_bridge.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_LOGO_BRIDGE_H_
 #define CHROME_BROWSER_ANDROID_LOGO_BRIDGE_H_
 
 #include <jni.h>
 
 #include <memory>
@@ skipping 20 matching lines @@
 struct RequestMetadata;
 }  // namespace image_fetcher
 
 // The C++ counterpart to LogoBridge.java. Enables Java code to access the
 // default search provider's logo.
 class LogoBridge : public doodle::DoodleService::Observer {
  public:
   explicit LogoBridge(jobject j_profile);
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
 
+  // TODO(treib): Double-check the observer contract (esp. for LogoTracker).
   // Gets the current non-animated logo (downloading it if necessary) and passes
   // it to the observer.
+  // The observer's |onLogoAvailable| is guaranteed to be called at least once:
+  // a) A cached doodle is available.
+  // b) A new doodle is available.
+  // c) The current doodle was revalidated..

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

The comment above is now slightly misleading: This can't be the "once" call,
because if there is a current doodle, then a) will have happened before.

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

Gone. Correct, it's not relevant in this context.

+  // d) Not having a doodle was revalidated.
   void GetCurrentLogo(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
       const base::android::JavaParamRef<jobject>& j_logo_observer);
 
   // Downloads the animated logo from the given URL and returns it to the
   // callback. Does not support multiple concurrent requests: A second request
   // for the same URL will be ignored; a request for a different URL will cancel
   // any ongoing request. If downloading fails, the callback is not called.
   void GetAnimatedLogo(JNIEnv* env,
                        const base::android::JavaParamRef<jobject>& obj,
                        const base::android::JavaParamRef<jobject>& j_callback,
                        const base::android::JavaParamRef<jstring>& j_url);
 
  private:
   class AnimatedLogoFetcher;
 
   virtual ~LogoBridge();
 
   // doodle::DoodleService::Observer implementation.
+  void OnDoodleConfigRevalidated() override;
   void OnDoodleConfigUpdated(
       const base::Optional<doodle::DoodleConfig>& maybe_doodle_config) override;
 
-  void DoodleConfigReceived(
-      const base::Optional<doodle::DoodleConfig>& maybe_doodle_config,
-      bool from_cache);
-
+  void NotifyNoLogoAvailable(bool from_cache);
+  void FetchDoodleImage(const doodle::DoodleConfig& doodle_config,
+                        bool from_cache);
   void DoodleImageFetched(bool config_from_cache,
                           const GURL& on_click_url,
                           const std::string& alt_text,
                           const GURL& animated_image_url,
                           const std::string& image_fetch_id,
                           const gfx::Image& image,
                           const image_fetcher::RequestMetadata& metadata);
 
   // Only valid if UseNewDoodleApi is disabled.
   LogoService* logo_service_;
 
   // Only valid if UseNewDoodleApi is enabled.
   doodle::DoodleService* doodle_service_;
   std::unique_ptr<image_fetcher::ImageFetcher> image_fetcher_;
   base::android::ScopedJavaGlobalRef<jobject> j_logo_observer_;
   ScopedObserver<doodle::DoodleService, doodle::DoodleService::Observer>
       doodle_observer_;
 
   std::unique_ptr<AnimatedLogoFetcher> animated_logo_fetcher_;
 
   base::WeakPtrFactory<LogoBridge> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LogoBridge);
 };
 
 bool RegisterLogoBridge(JNIEnv* env);
 
 #endif  // CHROME_BROWSER_ANDROID_LOGO_BRIDGE_H_