Use the BrowserActionsContainer for new extension bubbles in the toolbar redesign

chrome/browser/ui/views/extensions/extension_installed_bubble_view.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/extensions/extension_installed_bubble_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/i18n/rtl.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar/browser_action_view.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/extensions/api/omnibox/omnibox_handler.h"
 #include "chrome/common/extensions/sync_helper.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/feature_switch.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/render_text.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
@@ skipping 476 matching lines @@
     : bubble_(this, extension, browser, icon) {
 }
 
 ExtensionInstalledBubbleView::~ExtensionInstalledBubbleView() {}
 
 bool ExtensionInstalledBubbleView::MaybeShowNow() {
   BrowserView* browser_view =
       BrowserView::GetBrowserViewForBrowser(bubble_.browser());
 
   views::View* reference_view = NULL;
-  if (bubble_.type() == bubble_.BROWSER_ACTION) {
+  if (bubble_.type() == bubble_.BROWSER_ACTION ||
+      extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()) {
     BrowserActionsContainer* container =
         browser_view->GetToolbarView()->browser_actions();
     if (container->animating())
       return false;
 
     reference_view = container->GetViewForExtension(bubble_.extension());
     // If the view is not visible then it is in the chevron, so point the
     // install bubble to the chevron instead. If this is an incognito window,
     // both could be invisible.
     if (!reference_view || !reference_view->visible()) {
@@ skipping 45 matching lines @@
     const LocationBarView* location_bar_view =
         BrowserView::GetBrowserViewForBrowser(bubble_.browser())->
         GetLocationBarView();
     return gfx::Rect(location_bar_view->GetOmniboxViewOrigin(),
         gfx::Size(0, location_bar_view->omnibox_view()->height()));
   }
   return views::BubbleDelegateView::GetAnchorRect();
 }
 
 void ExtensionInstalledBubbleView::WindowClosing() {
-  if (bubble_.extension() && bubble_.type() == bubble_.PAGE_ACTION) {
+  if (bubble_.extension() && bubble_.type() == bubble_.PAGE_ACTION &&
+      !extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()) {
     BrowserView* browser_view =
         BrowserView::GetBrowserViewForBrowser(bubble_.browser());
     browser_view->GetLocationBarView()->SetPreviewEnabledPageAction(
         extensions::ExtensionActionManager::Get(bubble_.browser()->profile())->
         GetPageAction(*bubble_.extension()),
         false);  // preview_enabled
   }
 }