[Extensions UI] Convert ExtensionMessageBubbles to ToolbarActionsBarBubbles

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 <utility>
 
 #include "base/auto_reset.h"
 #include "base/location.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
+#include "base/time/time.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_bridge.h"
 #include "chrome/browser/ui/extensions/extension_message_bubble_factory.h"
 #include "chrome/browser/ui/layout_constants.h"
@@ skipping 67 matching lines @@
       while (!equal(to_sort->at(j), reference[i])) {
         ++j;
         DCHECK_LT(j, to_sort->size()) <<
             "Item in |reference| not found in |to_sort|.";
       }
       std::swap(to_sort->at(i), to_sort->at(j));
     }
   }
 }
 
+// How long to wait until showing an extension message bubble.
+int g_extension_bubble_appearance_wait_time_in_seconds = 5;
+
 }  // namespace
 
 // static
 bool ToolbarActionsBar::disable_animations_for_testing_ = false;
 
 ToolbarActionsBar::PlatformSettings::PlatformSettings()
     : item_spacing(GetLayoutConstant(TOOLBAR_STANDARD_SPACING)),
       icons_per_overflow_menu_row(1),
       chevron_enabled(!extensions::FeatureSwitch::extension_action_redesign()->
                           IsEnabled()) {
@@ skipping 488 matching lines @@
     delegate_->ShowToolbarActionBubble(std::move(bubble));
   }
 }
 
 void ToolbarActionsBar::MaybeShowExtensionBubble(
     std::unique_ptr<extensions::ExtensionMessageBubbleController> controller) {
   if (!controller->ShouldShow())
     return;
 
   controller->HighlightExtensionsIfNecessary();  // Safe to call multiple times.
-  ShowToolbarActionBubble(scoped_ptr<ToolbarActionsBarBubbleDelegate>(
-      new ExtensionMessageBubbleBridge(std::move(controller))));
+
+  // Not showing the bubble right away (during startup) has a few benefits:
+  // We don't have to worry about focus being lost due to the Omnibox (or to
+  // other things that want focus at startup). This allows Esc to work to close
+  // the bubble and also solves the keyboard accessibility problem that comes
+  // with focus being lost (we don't have a good generic mechanism of injecting
+  // bubbles into the focus cycle). Another benefit of delaying the show is
+  // that fade-in works (the fade-in isn't apparent if the the bubble appears at
+  // startup).
+  std::unique_ptr<ToolbarActionsBarBubbleDelegate> delegate(
+      new ExtensionMessageBubbleBridge(std::move(controller)));
+  base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+      FROM_HERE, base::Bind(&ToolbarActionsBar::ShowToolbarActionBubble,
+                            weak_ptr_factory_.GetWeakPtr(),
+                            base::Passed(std::move(delegate))),
+      base::TimeDelta::FromSeconds(
+          g_extension_bubble_appearance_wait_time_in_seconds));
+}
+
+// static
+void ToolbarActionsBar::set_extension_bubble_appearance_wait_time_for_testing(
+    int time_in_seconds) {
+  g_extension_bubble_appearance_wait_time_in_seconds = time_in_seconds;
 }
 
 void ToolbarActionsBar::OnToolbarActionAdded(
     const ToolbarActionsModel::ToolbarItem& item,
     int index) {
   DCHECK(GetActionForId(item.id) == nullptr)
       << "Asked to add a toolbar action view for an action that already "
          "exists";
 
   toolbar_actions_.insert(toolbar_actions_.begin() + index,
@@ skipping 175 matching lines @@
   for (ToolbarActionViewController* action : toolbar_actions_) {
     if (action->GetId() == action_id)
       return action;
   }
   return nullptr;
 }
 
 content::WebContents* ToolbarActionsBar::GetCurrentWebContents() {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }