WIP / Do not commit

chrome/browser/web_resource/promo_resource_service.cc

 // Copyright (c) 2011 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/web_resource/promo_resource_service.h"
 
 #include "base/command_line.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 38 matching lines @@
 static const char kWebStoreExpireProperty[] = "tooltip";
 
 const char* GetPromoResourceURL() {
 const char* kCaitPromoResourceServer =
     "http://caitkp-desktop.mon.corp.google.com/promo.js?";
   std::string promo_server_url = CommandLine::ForCurrentProcess()->
       GetSwitchValueASCII(switches::kPromoServerURL);
   return promo_server_url.empty() ?
       PromoResourceService::kDefaultPromoResourceServer :
       kCaitPromoResourceServer;
-      //promo_server_url.c_str();
 }
 
 bool IsTest() {
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kPromoServerURL);
 }
 
 int GetCacheUpdateDelay() {
   return IsTest() ? kTestCacheUpdateDelay : kCacheUpdateDelay;
 }
 
 }  // namespace
 
 // Server for dynamically loaded NTP HTML elements.
 const char* PromoResourceService::kDefaultPromoResourceServer =
     "https://www.google.com/support/chrome/bin/topic/1142433/inproduct?hl=";
 
 
 
 // static
 void PromoResourceService::RegisterPrefs(PrefService* local_state) {
   local_state->RegisterIntegerPref(prefs::kNTPPromoVersion, 0);
   local_state->RegisterStringPref(prefs::kNTPPromoLocale, std::string());
 }
 
 // static
 void PromoResourceService::RegisterUserPrefs(PrefService* prefs) {
+  RegisterLastUpdateTimePref(prefs, prefs::kNTPPromoResourceCacheUpdate);
   prefs->RegisterDoublePref(prefs::kNTPCustomLogoStart,
                             0,
                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterDoublePref(prefs::kNTPCustomLogoEnd,
                             0,
                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kNTPSignInPromoGroup,
                              0,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kNTPSignInPromoGroupMax,
@@ skipping 30 matching lines @@
       // Show promos for local builds when using a custom promo URL.
       return CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kPromoServerURL);
   }
 }
 
 PromoResourceService::PromoResourceService(Profile* profile)
     : WebResourceService(profile->GetPrefs(),
                          GetPromoResourceURL(),
                          false,//true,  // append locale to URL
-                         chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED,
                          prefs::kNTPPromoResourceCacheUpdate,
                          kStartResourceFetchDelay,
                          GetCacheUpdateDelay()),
-                         profile_(profile),
-                         channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {
-  Init();
+      profile_(profile),
+      channel_(chrome::VersionInfo::CHANNEL_UNKNOWN),
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
+      web_resource_update_scheduled_(false) {
+  ScheduleNotificationOnInit();
 }
 
 PromoResourceService::~PromoResourceService() { }
 
-void PromoResourceService::Init() {
-  ScheduleNotificationOnInit();
-}
-
 bool PromoResourceService::IsBuildTargeted(int builds_targeted) {
   if (channel_ == chrome::VersionInfo::CHANNEL_UNKNOWN)
     channel_ = GetChannel();
 
   return IsBuildTargeted(channel_, builds_targeted);
 }
 
 void PromoResourceService::Unpack(const DictionaryValue& parsed_json) {
   UnpackLogoSignal(parsed_json);
   UnpackNotificationSignal(parsed_json);
@@ skipping 43 matching lines @@
     PostNotification(0);
   } else {
     // If the promo start is in the future, set a notification task to
     // invalidate the NTP cache at the time of the promo start.
     double promo_start = prefs_->GetDouble(prefs::kNTPPromoStart);
     double promo_end = prefs_->GetDouble(prefs::kNTPPromoEnd);
     ScheduleNotification(promo_start, promo_end);
   }
 }
 
+void PromoResourceService::PostNotification(int64 delay_ms) {
+  if (web_resource_update_scheduled_)
+    return;
+  if (delay_ms > 0) {
+    web_resource_update_scheduled_ = true;
+    MessageLoop::current()->PostDelayedTask(
+        FROM_HERE,
+        base::Bind(&PromoResourceService::PromoResourceStateChange,
+                   weak_ptr_factory_.GetWeakPtr()),
+        delay_ms);
+  } else if (delay_ms == 0) {
+    PromoResourceStateChange();
+  }
+}
+
+void PromoResourceService::PromoResourceStateChange() {
+  web_resource_update_scheduled_ = false;
+  content::NotificationService* service =
+      content::NotificationService::current();
+  service->Notify(chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED,
+                  content::Source<WebResourceService>(this),
+                  content::NotificationService::NoDetails());
+}
+
 int PromoResourceService::GetPromoServiceVersion() {
   PrefService* local_state = g_browser_process->local_state();
   return local_state->GetInteger(prefs::kNTPPromoVersion);
 }
 
 std::string PromoResourceService::GetPromoLocale() {
   PrefService* local_state = g_browser_process->local_state();
   return local_state->GetString(prefs::kNTPPromoLocale);
 }
 
@@ skipping 234 matching lines @@
   if (!prefs->HasPrefPath(prefs::kNTPSignInPromoGroup)) {
     prefs->SetInteger(prefs::kNTPSignInPromoGroup,
                       base::RandInt(1, kNTPSignInPromoNumberOfGroups));
   }
 
   // A response is not kept if the build wasn't targeted, so the only thing
   // required to check is the group this client has been tagged in.
   return prefs->GetInteger(prefs::kNTPSignInPromoGroupMax) >=
          prefs->GetInteger(prefs::kNTPSignInPromoGroup);
 }