[Extensions UI] Use the ExtensionMessageBubbleBridge for Views platforms

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

 // Copyright 2016 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/toolbar_actions_bar_bubble_views.h"
 
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h"
+#include "chrome/browser/ui/view_ids.h"
 #include "chrome/grit/locale_settings.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 
 ToolbarActionsBarBubbleViews::ToolbarActionsBarBubbleViews(
     views::View* anchor_view,
     std::unique_ptr<ToolbarActionsBarBubbleDelegate> delegate)
     : views::BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT),
+      anchor_view_(anchor_view),
       delegate_(std::move(delegate)),
       heading_label_(nullptr),
       content_label_(nullptr),
       dismiss_button_(nullptr),
       action_button_(nullptr),
-      acknowledged_(false) {}
+      acknowledged_(false) {
+  set_close_on_deactivate(delegate_->ShouldCloseOnDeactivate());
+}
 
 ToolbarActionsBarBubbleViews::~ToolbarActionsBarBubbleViews() {}
 
 void ToolbarActionsBarBubbleViews::Show() {
   delegate_->OnBubbleShown();
   GetWidget()->Show();
 }
 
 void ToolbarActionsBarBubbleViews::Init() {
   views::GridLayout* layout = new views::GridLayout(this);
@@ skipping 26 matching lines @@
       ui::ResourceBundle::GetSharedInstance().GetFontList(
           ui::ResourceBundle::MediumFont));
   heading_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   layout->AddView(heading_label_);
   layout->AddPaddingRow(0, views::kLabelToControlVerticalSpacing);
   int width = views::Widget::GetLocalizedContentsWidth(
       IDS_EXTENSION_TOOLBAR_REDESIGN_NOTIFICATION_BUBBLE_WIDTH_CHARS);
 
   // Add the content string.
   layout->StartRow(0, HEADER_AND_BODY_COLUMN_SET);
-  content_label_ = new views::Label(delegate_->GetBodyText());
+  content_label_ = new views::Label(
+      delegate_->GetBodyText(anchor_view_->id() == VIEW_ID_BROWSER_ACTION));
   content_label_->SetMultiLine(true);
   content_label_->SizeToFit(width);
   content_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   layout->AddView(content_label_);
   layout->AddPaddingRow(0, views::kLabelToControlVerticalSpacing);
 
   layout->StartRow(0, BUTTON_STRIP_COLUMN_SET);
   base::string16 dismiss_button_text = delegate_->GetDismissButtonText();
   if (!dismiss_button_text.empty()) {
     dismiss_button_ = new views::LabelButton(this, dismiss_button_text);
@@ skipping 22 matching lines @@
     acknowledged_ = true;
   }
 }
 
 void ToolbarActionsBarBubbleViews::ButtonPressed(views::Button* sender,
                                                  const ui::Event& event) {
   delegate_->OnBubbleClosed(ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE);
   acknowledged_ = true;
   GetWidget()->Close();
 }