Index: chrome/browser/ui/views/toolbar/browser_actions_container.cc |
diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.cc b/chrome/browser/ui/views/toolbar/browser_actions_container.cc |
index 313026746f525c711a06c96b4adb941c1bab6bb1..02f9e0c2642fed5f133fea1efa305f1a54e61af4 100644 |
--- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc |
+++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc |
@@ -10,6 +10,7 @@ |
#include "chrome/browser/extensions/tab_helper.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/ui/browser.h" |
+#include "chrome/browser/ui/extensions/extension_toolbar_icon_surfacing_bubble_delegate.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" |
@@ -494,12 +495,15 @@ void BrowserActionsContainer::Layout() { |
void BrowserActionsContainer::OnMouseEntered(const ui::MouseEvent& event) { |
if (!shown_bubble_ && !toolbar_action_views_.empty() && |
- toolbar_actions_bar_->ShouldShowInfoBubble()) { |
+ ExtensionToolbarIconSurfacingBubbleDelegate::ShouldShowForProfile( |
+ browser_->profile())) { |
ExtensionToolbarIconSurfacingBubble* bubble = |
- new ExtensionToolbarIconSurfacingBubble(toolbar_action_views_[0], |
- toolbar_actions_bar_.get()); |
+ new ExtensionToolbarIconSurfacingBubble( |
+ toolbar_action_views_[0], |
+ make_scoped_ptr(new ExtensionToolbarIconSurfacingBubbleDelegate( |
+ browser_->profile()))); |
views::BubbleDelegateView::CreateBubble(bubble); |
- bubble->GetWidget()->Show(); |
+ bubble->Show(); |
} |
shown_bubble_ = true; |
} |