[Extensions UI] Convert ExtensionMessageBubbles to ToolbarActionsBarBubbles

chrome/browser/ui/views/toolbar/browser_actions_container.cc

 // Copyright 2013 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/toolbar/browser_actions_container.h"
 
 #include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_message_bubble_controller.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.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/toolbar_actions_bar_bubble_views.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/extensions/command.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/common/feature_switch.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 287 matching lines @@
           action_view->visible() ? action_view : GetOverflowReferenceView();
     } else {
       anchor_view = BrowserView::GetBrowserViewForBrowser(browser_)
                         ->toolbar()
                         ->app_menu_button();
     }
   } else {
     anchor_view = this;
   }
 
-  // TODO(devlin): Clean up this type-specific mess.
-  if (controller->IsExtensionMessageBubble()) {
-    extensions::ExtensionMessageBubbleView* bubble =
-        new extensions::ExtensionMessageBubbleView(
-            anchor_view, views::BubbleBorder::TOP_RIGHT, std::move(controller));
-    views::BubbleDelegateView::CreateBubble(bubble);
-    active_bubble_ = bubble;
-    active_bubble_->GetWidget()->AddObserver(this);
-    bubble->Show();
-  } else {
-    ToolbarActionsBarBubbleViews* bubble =
-        new ToolbarActionsBarBubbleViews(anchor_view, std::move(controller));
-    views::BubbleDelegateView::CreateBubble(bubble);
-    active_bubble_ = bubble;
-    active_bubble_->GetWidget()->AddObserver(this);
-    bubble->Show();
-  }
+  ToolbarActionsBarBubbleViews* bubble =
+      new ToolbarActionsBarBubbleViews(anchor_view, std::move(controller));
+  views::BubbleDelegateView::CreateBubble(bubble);
+  active_bubble_ = bubble;
+  active_bubble_->GetWidget()->AddObserver(this);
+  bubble->Show();
 }
 
 void BrowserActionsContainer::OnWidgetClosing(views::Widget* widget) {
   ClearActiveBubble(widget);
 }
 
 void BrowserActionsContainer::OnWidgetDestroying(views::Widget* widget) {
   ClearActiveBubble(widget);
 }
 
@@ skipping 403 matching lines @@
       views::Painter::CreateImageGridPainter(kWarningImages));
 }
 
 void BrowserActionsContainer::ClearActiveBubble(views::Widget* widget) {
   DCHECK(active_bubble_);
   DCHECK_EQ(active_bubble_->GetWidget(), widget);
   widget->RemoveObserver(this);
   active_bubble_ = nullptr;
   toolbar_actions_bar_->OnBubbleClosed();
 }