[Extensions] Add logic for when to show the toolbar redesign bubble.

chrome/browser/ui/toolbar/toolbar_actions_bar.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/ui/toolbar/toolbar_actions_bar.h"
 
 #include "base/auto_reset.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/extension_action_view_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h"
+#include "chrome/common/pref_names.h"
 #include "components/crx_file/id_util.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/runtime_data.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/feature_switch.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace {
@@ skipping 630 matching lines @@
     else if (drag_type == DRAG_TO_MAIN)
       delta = 1;
     model_->MoveExtensionIcon(toolbar_actions_[dragged_index]->GetId(),
                               dropped_index);
     if (delta)
       model_->SetVisibleIconCount(model_->visible_icon_count() + delta);
   }
 }
 
 bool ToolbarActionsBar::ShouldShowInfoBubble() {
-  return false;
+  // If the redesign isn't running, or the user has already acknowledged it,
+  // we don't show the bubble.
+  PrefService* prefs = browser_->profile()->GetPrefs();
+  if (!extensions::FeatureSwitch::extension_action_redesign()->IsEnabled() ||
+      (prefs->HasPrefPath(prefs::kToolbarIconSurfacingBubbleAcknowledged) &&
+       prefs->GetBoolean(prefs::kToolbarIconSurfacingBubbleAcknowledged)))
+    return false;
+
+  // We don't show more than once per day.
+  if (prefs->HasPrefPath(prefs::kToolbarIconSurfacingBubbleLastShowTime)) {
+    base::Time last_shown_time = base::Time::FromInternalValue(
+        prefs->GetInt64(prefs::kToolbarIconSurfacingBubbleLastShowTime));
+    if (base::Time::Now() - last_shown_time < base::TimeDelta::FromDays(1))
+      return false;
+  }
+
+  if (!model_->RedesignIsShowingNewIcons()) {
+    // We only show the bubble if there are any new icons present - otherwise,
+    // the user won't see anything different.
+    browser_->profile()->GetPrefs()->SetBoolean(
+        prefs::kToolbarIconSurfacingBubbleAcknowledged, true);
+    return false;
+  }
+
+  return true;
 }
 
 void ToolbarActionsBar::OnToolbarExtensionAdded(
     const extensions::Extension* extension,
     int index) {
   DCHECK(GetActionForId(extension->id()) == nullptr) <<
       "Asked to add a toolbar action view for an extension that already exists";
 
   toolbar_actions_.insert(
       toolbar_actions_.begin() + index,
@@ skipping 145 matching lines @@
   // We shouldn't have any actions before the model is initialized.
   DCHECK(toolbar_actions_.empty());
   CreateActions();
   ResizeDelegate(gfx::Tween::EASE_OUT, false);
 }
 
 Browser* ToolbarActionsBar::GetBrowser() {
   return browser_;
 }
 
+void ToolbarActionsBar::OnToolbarActionsBarBubbleShown() {
+  // Record the last time the bubble was shown.
+  browser_->profile()->GetPrefs()->SetInt64(
+      prefs::kToolbarIconSurfacingBubbleLastShowTime,
+      base::Time::Now().ToInternalValue());
+}
+
 void ToolbarActionsBar::OnToolbarActionsBarBubbleClosed(CloseAction action) {
+  if (action == ToolbarActionsBarBubbleDelegate::ACKNOWLEDGED) {
+    browser_->profile()->GetPrefs()->SetBoolean(
+        prefs::kToolbarIconSurfacingBubbleAcknowledged, true);

[Finnur, 2015/03/13 10:54:53]

Once you set this to true, there's no longer a need to carry around the last
shown time pref, right? We should probably delete it.

Note: You set this to true in two places so you'd want to refactor this into a
small helper function and call it here and on line 690.

[Devlin, 2015/03/13 16:33:28]

Good call; we can definitely clear the pref.

I don't think we need the helper function, since we can just call
OnToolbarActionsBarBubbleClosed() from ShouldShowInfoBubble(), but lemme know if
you think this is confusing. :)

+  }
 }
 
 void ToolbarActionsBar::ReorderActions() {
   if (toolbar_actions_.empty())
     return;
 
   // First, reset the order to that of the model.
   auto compare = [](ToolbarActionViewController* const& action,
                     const scoped_refptr<const extensions::Extension>& ext) {
     return action->GetId() == ext->id();
@@ skipping 50 matching lines @@
   for (ToolbarActionViewController* action : toolbar_actions_) {
     if (action->GetId() == id)
       return action;
   }
   return nullptr;
 }
 
 content::WebContents* ToolbarActionsBar::GetCurrentWebContents() {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }