Introduce Animated Logo to Chrome on Android

chrome/browser/android/logo_service.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_service.h"
 
 #include "base/memory/weak_ptr.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/image_decoder.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/search_provider_logos/google_logo_api.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using content::BrowserThread;
+using search_provider_logos::AnimatedLogoTracker;
 using search_provider_logos::Logo;
 using search_provider_logos::LogoDelegate;
 using search_provider_logos::LogoTracker;
 
 namespace {
 
 const char kCachedLogoDirectory[] = "Search Logo";
 const int kDecodeLogoTimeoutSeconds = 30;
 
 // Returns the URL where the doodle can be downloaded, e.g.
 // https://www.google.com/async/newtab_mobile. This depends on the user's
 // Google domain.
 GURL GetGoogleDoodleURL(Profile* profile) {
   GURL google_base_url(UIThreadSearchTermsData(profile).GoogleBaseURLValue());
   const char kGoogleDoodleURLPath[] = "async/newtab_mobile";
   GURL::Replacements replacements;
   replacements.SetPathStr(kGoogleDoodleURLPath);
   return google_base_url.ReplaceComponents(replacements);
+  return GURL(url);
 }
 
 class LogoDecoderDelegate : public ImageDecoder::ImageRequest {
  public:
   LogoDecoderDelegate(
       const base::Callback<void(const SkBitmap&)>& image_decoded_callback)
       : image_decoded_callback_(image_decoded_callback),
         weak_ptr_factory_(this) {
     // If the ImageDecoder crashes or otherwise never completes, call
     // OnImageDecodeTimedOut() eventually to ensure that image_decoded_callback_
@@ skipping 70 matching lines @@
         BrowserThread::GetBlockingPool(),
         profile_->GetRequestContext(),
         scoped_ptr<search_provider_logos::LogoDelegate>(
             new ChromeLogoDelegate())));
   }
 
   logo_tracker_->SetServerAPI(
       GetGoogleDoodleURL(profile_),
       base::Bind(&search_provider_logos::GoogleParseLogoResponse),
       base::Bind(&search_provider_logos::GoogleAppendQueryparamsToLogoURL),
-      false);
+      true);
   logo_tracker_->GetLogo(observer);
 }
 
+void LogoService::GetAnimatedLogo(
+    const GURL& animated_logo_url,
+    const search_provider_logos::AnimatedLogoCallback& callback) {
+
+  if (!animated_logo_tracker_) {
+    animated_logo_tracker_.reset(
+        new AnimatedLogoTracker(profile_->GetRequestContext()));
+  }
+  animated_logo_tracker_->GetAnimatedLogo(animated_logo_url, callback);
+}
+
 // LogoServiceFactory ---------------------------------------------------------
 
 // static
 LogoService* LogoServiceFactory::GetForProfile(Profile* profile) {
   return static_cast<LogoService*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
 LogoServiceFactory* LogoServiceFactory::GetInstance() {
   return Singleton<LogoServiceFactory>::get();
 }
 
 LogoServiceFactory::LogoServiceFactory()
     : BrowserContextKeyedServiceFactory(
           "LogoService",
           BrowserContextDependencyManager::GetInstance()) {
 }
 
 LogoServiceFactory::~LogoServiceFactory() {}
 
 KeyedService* LogoServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile = static_cast<Profile*>(context);
   DCHECK(!profile->IsOffTheRecord());
   return new LogoService(profile);
 }