[Extensions UI] Convert ExtensionMessageBubbles to ToolbarActionsBarBubbles

chrome/browser/ui/views/settings_api_bubble_helper_views.cc

 // Copyright (c) 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/views/settings_api_bubble_helper_views.h"
 
 #include <utility>
 
 #include "build/build_config.h"
 #include "chrome/browser/extensions/ntp_overridden_bubble_delegate.h"
 #include "chrome/browser/extensions/settings_api_bubble_delegate.h"
 #include "chrome/browser/extensions/settings_api_helpers.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/extensions/extension_message_bubble_bridge.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar/app_menu_button.h"
 #include "chrome/browser/ui/views/toolbar/home_button.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_url_handler.h"
 #include "content/public/browser/navigation_entry.h"
 
 namespace extensions {
 
 namespace {
 
 void ShowSettingsApiBubble(SettingsApiOverrideType type,
                            Browser* browser,
                            views::View* anchor_view,
                            views::BubbleBorder::Arrow arrow) {
   std::unique_ptr<ExtensionMessageBubbleController> settings_api_bubble(
       new ExtensionMessageBubbleController(
           new SettingsApiBubbleDelegate(browser->profile(), type), browser));
   if (!settings_api_bubble->ShouldShow())
     return;
 
-  ExtensionMessageBubbleView* bubble = new ExtensionMessageBubbleView(
-      anchor_view, arrow,
-      std::unique_ptr<ToolbarActionsBarBubbleDelegate>(
-          new ExtensionMessageBubbleBridge(std::move(settings_api_bubble))));
+  // TODO(devlin): This should go through the ToolbarActionsBar.
+  ToolbarActionsBarBubbleViews* bubble =
+      new ToolbarActionsBarBubbleViews(
+          anchor_view,
+          scoped_ptr<ToolbarActionsBarBubbleDelegate>(
+              new ExtensionMessageBubbleBridge(
+                  std::move(settings_api_bubble))));
+  bubble->set_arrow(arrow);
   views::BubbleDelegateView::CreateBubble(bubble);
   bubble->Show();
 }
 
 }  // namespace
 
 void MaybeShowExtensionControlledHomeNotification(Browser* browser) {
 #if !defined(OS_WIN)
   return;
 #endif
@@ skipping 49 matching lines @@
       &ignored_param);
   if (ntp_url != active_url)
     return;  // Not being overridden by an extension.
 
   std::unique_ptr<ExtensionMessageBubbleController> ntp_overridden_bubble(
       new ExtensionMessageBubbleController(
           new NtpOverriddenBubbleDelegate(browser->profile()), browser));
   if (!ntp_overridden_bubble->ShouldShow())
     return;
 
-  ExtensionMessageBubbleView* bubble = new ExtensionMessageBubbleView(
+  ToolbarActionsBarBubbleViews* bubble =
+      new ToolbarActionsBarBubbleViews(
       BrowserView::GetBrowserViewForBrowser(browser)
           ->toolbar()
           ->app_menu_button(),
-      views::BubbleBorder::TOP_RIGHT,
       std::unique_ptr<ToolbarActionsBarBubbleDelegate>(
           new ExtensionMessageBubbleBridge(std::move(ntp_overridden_bubble))));
+  bubble->set_arrow(views::BubbleBorder::TOP_RIGHT);
   views::BubbleDelegateView::CreateBubble(bubble);
   bubble->Show();
 }
 
 }  // namespace extensions