Create ExtensionActionView class

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/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_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_keybinding_registry_views.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container_observer.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/extensions/command.h"
@@ skipping 182 matching lines @@
       model_->SetVisibleIconCount(WidthToIconCount(predefined_width));
   }
   if (model_ && model_->extensions_initialized())
     SetContainerWidth();
 }
 
 BrowserActionView* BrowserActionsContainer::GetBrowserActionView(
     ExtensionAction* action) {
   for (BrowserActionViews::iterator i(browser_action_views_.begin());
        i != browser_action_views_.end(); ++i) {
-    if ((*i)->button()->browser_action() == action)
+    if ((*i)->button()->extension_action() == action)
       return *i;
   }
   return NULL;
 }
 
 void BrowserActionsContainer::RefreshBrowserActionViews() {
   for (size_t i = 0; i < browser_action_views_.size(); ++i)
     browser_action_views_[i]->button()->UpdateState();
 }
 
@@ skipping 68 matching lines @@
 }
 
 void BrowserActionsContainer::SetPopupOwner(BrowserActionButton* popup_owner) {
   // We should never be setting a popup owner when one already exists.
   DCHECK(!popup_owner_ || !popup_owner);
   popup_owner_ = popup_owner;
 }
 
 void BrowserActionsContainer::HideActivePopup() {
   if (popup_owner_)
-    popup_owner_->HidePopup();
-}
-
-extensions::ExtensionToolbarModel* BrowserActionsContainer::GetModel() {
-  return model_;
+    popup_owner_->view_controller()->HidePopup();
 }
 
 void BrowserActionsContainer::AddObserver(
     BrowserActionsContainerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void BrowserActionsContainer::RemoveObserver(
     BrowserActionsContainerObserver* observer) {
   observers_.RemoveObserver(observer);
@@ skipping 330 matching lines @@
                     observers_,
                     OnBrowserActionsContainerAnimationEnded());
 }
 
 void BrowserActionsContainer::NotifyMenuDeleted(
     BrowserActionOverflowMenuController* controller) {
   DCHECK_EQ(overflow_menu_, controller);
   overflow_menu_ = NULL;
 }
 
-int BrowserActionsContainer::GetCurrentTabId() const {
-  content::WebContents* active_tab =
-      browser_->tab_strip_model()->GetActiveWebContents();
-  if (!active_tab)
-    return -1;
-
-  return SessionTabHelper::FromWebContents(active_tab)->session_id().id();
+content::WebContents* BrowserActionsContainer::GetCurrentWebContents() {
+  return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
 void BrowserActionsContainer::OnBrowserActionVisibilityChanged() {
   SetVisible(!browser_action_views_.empty());
   if (owner_view_) {
     owner_view_->Layout();
     owner_view_->SchedulePaint();
   }
 }
 
@@ skipping 13 matching lines @@
       enabled_extensions().GetByID(extension_id);
   model_->MoveBrowserAction(extension, new_index);
   SchedulePaint();
 }
 
 size_t BrowserActionsContainer::GetFirstVisibleIconIndex() const {
   return in_overflow_mode() ? model_->GetVisibleIconCount() : 0;
 }
 
 ExtensionPopup* BrowserActionsContainer::TestGetPopup() {
-  return popup_owner_ ? popup_owner_->popup() : NULL;
+  return popup_owner_ ? popup_owner_->view_controller()->popup() : NULL;
 }
 
 void BrowserActionsContainer::TestSetIconVisibilityCount(size_t icons) {
   model_->SetVisibleIconCount(icons);
   chevron_->SetVisible(icons < browser_action_views_.size());
   container_width_ = IconCountToWidth(icons, chevron_->visible());
   Layout();
   SchedulePaint();
 }
 
@@ skipping 338 matching lines @@
       (popup_owner_ ||
        !browser_->window()->IsActive() ||
        !browser_->window()->IsToolbarVisible())) {
     return false;
   }
 
   for (BrowserActionViews::iterator iter = browser_action_views_.begin();
        iter != browser_action_views_.end(); ++iter) {
     BrowserActionButton* button = (*iter)->button();
     if (button->extension() == extension)
-      return button->ShowPopup(ExtensionPopup::SHOW, grant_tab_permissions);
+      return button->view_controller()->ExecuteAction(
+          ExtensionPopup::SHOW, grant_tab_permissions);
   }
   return false;
 }