[Reland] [Extensions] Make extension message bubble factory platform-abstract

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 "base/profiler/scoped_tracker.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
+#include "chrome/browser/extensions/extension_message_bubble_controller.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/extensions/extension_message_bubble_factory.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 "components/pref_registry/pref_registry_syncable.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/runtime_data.h"
@@ skipping 385 matching lines @@
                                      Browser* browser,
                                      ToolbarActionsBar* main_bar)
     : delegate_(delegate),
       browser_(browser),
       model_(extensions::ExtensionToolbarModel::Get(browser_->profile())),
       main_bar_(main_bar),
       platform_settings_(main_bar != nullptr),
       model_observer_(this),
       suppress_layout_(false),
       suppress_animation_(true),
-      overflowed_action_wants_to_run_(false) {
+      overflowed_action_wants_to_run_(false),
+      checked_extension_bubble_(false),
+      weak_ptr_factory_(this) {
   if (model_)  // |model_| can be null in unittests.
     model_observer_.Add(model_);
 
   if (pop_out_actions_to_run_) {
     if (in_overflow_mode())
       main_bar_->tab_order_helper_->notify_overflow_bar(this, true);
     else
       tab_order_helper_.reset(new TabOrderHelper(this, browser_, model_));
   }
 }
@@ skipping 192 matching lines @@
 
     tracked_objects::ScopedTracker tracking_profile4(
         FROM_HERE_WITH_EXPLICIT_FUNCTION("ToolbarActionsBar::CreateActions4"));
 
     for (size_t i = 0; i < toolbar_actions_.size(); ++i)
       delegate_->AddViewForAction(toolbar_actions_[i], i);
   }
 
   // Once the actions are created, we should animate the changes.
   suppress_animation_ = false;
+
+  // CreateActions() can be called multiple times, so we need to make sure we
+  // haven't already shown the bubble.
+  if (!checked_extension_bubble_) {
+    checked_extension_bubble_ = true;
+    // CreateActions() can be called as part of the browser window set up, which

[Devlin, 2015/04/14 16:37:37]

This is what was actually causing the crash (funny thing - it would only show up
on official builders, running windows, and then only from a non-initial browser
window opening, after the initial window opens and doesn't need to show a
bubble, and after an unpacked extension without a browser action has been added
- gotta love edge cases! ;)).  But it was also indicative of the fact that we
didn't really have any tests for the bubble itself.  I added a handful, enabled
on all views platforms, one of which handles the specific case mentioned above
(which did crash before this fix).

[Finnur, 2015/04/15 14:51:37]

Woot.

+    // we need to let finish before showing the actions.
+    base::MessageLoop::current()->PostTask(
+        FROM_HERE,
+        base::Bind(&ToolbarActionsBar::MaybeShowExtensionBubble,
+                   weak_ptr_factory_.GetWeakPtr()));
+  }
 }
 
 void ToolbarActionsBar::DeleteActions() {
   delegate_->RemoveAllViews();
   toolbar_actions_.clear();
 }
 
 void ToolbarActionsBar::Update() {
   if (toolbar_actions_.empty())
     return;  // Nothing to do.
@@ skipping 78 matching lines @@
     // We only show the bubble if there are any new icons present - otherwise,
     // the user won't see anything different, so we treat it as acknowledged.
     OnToolbarActionsBarBubbleClosed(
         ToolbarActionsBarBubbleDelegate::ACKNOWLEDGED);
     return false;
   }
 
   return true;
 }
 
+void ToolbarActionsBar::MaybeShowExtensionBubble() {
+  scoped_ptr<extensions::ExtensionMessageBubbleController> controller =
+      ExtensionMessageBubbleFactory(browser_->profile()).GetController();
+  if (controller) {
+    controller->HighlightExtensionsIfNecessary();
+    delegate_->ShowExtensionMessageBubble(controller.Pass());
+  }
+}
+
 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,
       new ExtensionActionViewController(
           extension,
@@ skipping 235 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();
 }