Changes to default apps promo per ui leads:

chrome/browser/extensions/default_apps.cc

 // Copyright (c) 2010 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/extensions/default_apps.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 69 matching lines @@
   // installed before showing the apps section. We also show it if any
   // non-default app is installed (eg because the user installed the app in a
   // previous version of Chrome).
   if (GetDefaultAppsInstalled() || NonDefaultAppIsInstalled(installed_ids))
     return true;
   else
     return false;
 #endif
 }
 
-bool DefaultApps::ShouldShowPromo(const ExtensionIdSet& installed_ids) {
+bool DefaultApps::ShouldShowPromo(const ExtensionIdSet& installed_ids,
+                                  bool* just_expired) {
+  *just_expired = false;
+
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kForceAppsPromoVisible)) {
     return true;
   }
 
   if (!DefaultAppSupported())
     return false;
 
-  if (GetDefaultAppsInstalled() && GetPromoCounter() < kAppsPromoCounterMax) {
+  if (!GetDefaultAppsInstalled())
+    return false;
+
+  int promo_counter = GetPromoCounter();
+  if (promo_counter <= kAppsPromoCounterMax) {
     // If we have the exact set of default apps, show the promo. If we don't
     // have the exact set of default apps, this means that the user manually
     // installed or uninstalled one. The promo doesn't make sense if it shows
     // apps the user manually installed, so expire it immediately in that
     // situation.
-    if (installed_ids == ids_)
+    if (ids_ != installed_ids) {
+      SetPromoHidden();
+      return false;
+    }
+
+    if (promo_counter == kAppsPromoCounterMax) {
+      *just_expired = true;
+      UMA_HISTOGRAM_ENUMERATION(extension_misc::kAppsPromoHistogram,
+                                extension_misc::PROMO_EXPIRE,
+                                extension_misc::PROMO_BUCKET_BOUNDARY);
+      SetPromoCounter(++promo_counter);
+      return false;
+    } else {
+      UMA_HISTOGRAM_ENUMERATION(extension_misc::kAppsPromoHistogram,
+                                extension_misc::PROMO_SEEN,
+                                extension_misc::PROMO_BUCKET_BOUNDARY);
+      SetPromoCounter(++promo_counter);
       return true;
-    else
-      SetPromoHidden();
+    }
   }
 
   return false;
 }
 
 void DefaultApps::DidInstallApp(const ExtensionIdSet& installed_ids) {
   // If all the default apps have been installed, stop trying to install them.
   // Note that we use std::includes here instead of == because apps might have
   // been manually installed while the the default apps were installing and we
   // wouldn't want to keep trying to install them in that case.
   if (!GetDefaultAppsInstalled() &&
       std::includes(installed_ids.begin(), installed_ids.end(),
                     ids_.begin(), ids_.end())) {
     SetDefaultAppsInstalled(true);
   }
 }
 
-void DefaultApps::DidShowPromo() {
-  if (!GetDefaultAppsInstalled()) {
-    NOTREACHED() << "Should not show promo until default apps are installed.";
-    return;
-  }
-
-  int promo_counter = GetPromoCounter();
-  if (promo_counter == kAppsPromoCounterMax) {
-    NOTREACHED() << "Promo has already been shown the maximum number of times.";
-    return;
-  }
-
-  if (promo_counter < kAppsPromoCounterMax) {
-    if (promo_counter + 1 == kAppsPromoCounterMax)
-      UMA_HISTOGRAM_ENUMERATION(extension_misc::kAppsPromoHistogram,
-                                extension_misc::PROMO_EXPIRE,
-                                extension_misc::PROMO_BUCKET_BOUNDARY);
-    SetPromoCounter(++promo_counter);
-  } else {
-    SetPromoHidden();
-  }
-}
-
 bool DefaultApps::NonDefaultAppIsInstalled(
     const ExtensionIdSet& installed_ids) const {
   for (ExtensionIdSet::const_iterator iter = installed_ids.begin();
        iter != installed_ids.end(); ++iter) {
     if (ids_.find(*iter) == ids_.end())
       return true;
   }
 
   return false;
 }
 
 void DefaultApps::SetPromoHidden() {
-  SetPromoCounter(kAppsPromoCounterMax);
+  SetPromoCounter(kAppsPromoCounterMax + 1);
 }
 
 int DefaultApps::GetPromoCounter() const {
   return prefs_->GetInteger(prefs::kAppsPromoCounter);
 }
 
 void DefaultApps::SetPromoCounter(int val) {
   prefs_->SetInteger(prefs::kAppsPromoCounter, val);
   prefs_->ScheduleSavePersistentPrefs();
 }
 
 bool DefaultApps::GetDefaultAppsInstalled() const {
   return prefs_->GetBoolean(prefs::kDefaultAppsInstalled);
 }
 
 void DefaultApps::SetDefaultAppsInstalled(bool val) {
   prefs_->SetBoolean(prefs::kDefaultAppsInstalled, val);
   prefs_->ScheduleSavePersistentPrefs();
 }