[Extensions] Add logic for when to show the toolbar redesign bubble.

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 "base/compiler_specific.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 431 matching lines @@
                           index_in_row * ToolbarActionsBar::IconWidth(true),
                       row_index * ToolbarActionsBar::IconHeight(),
                       ToolbarActionsBar::IconWidth(false),
                       ToolbarActionsBar::IconHeight());
       view->SetVisible(true);
     }
   }
 }
 
 void BrowserActionsContainer::OnMouseEntered(const ui::MouseEvent& event) {
-  if (!shown_bubble_ && !toolbar_action_views_.empty()) {
+  if (!shown_bubble_ && !toolbar_action_views_.empty() &&
+      toolbar_actions_bar_->ShouldShowInfoBubble()) {
     ExtensionToolbarIconSurfacingBubble* bubble =
         new ExtensionToolbarIconSurfacingBubble(toolbar_action_views_[0],
                                                 toolbar_actions_bar_.get());
     views::BubbleDelegateView::CreateBubble(bubble);
     bubble->GetWidget()->Show();
   }
   shown_bubble_ = true;
 }
 
 bool BrowserActionsContainer::GetDropFormats(
@@ skipping 309 matching lines @@
 
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp && chevron_) {
     chevron_->SetImage(views::Button::STATE_NORMAL,
                        *tp->GetImageSkiaNamed(IDR_BROWSER_ACTIONS_OVERFLOW));
   }
 
   const int kImages[] = IMAGE_GRID(IDR_DEVELOPER_MODE_HIGHLIGHT);
   highlight_painter_.reset(views::Painter::CreateImageGridPainter(kImages));
 }