| 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 e62a333227531fc16c019dcc016c4cec9fbb7928..2b7c7059a6a7e020675aee3855a0bfd2fcd28eef 100644
|
| --- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc
|
| +++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
|
| @@ -138,7 +138,6 @@ BrowserActionsContainer::BrowserActionsContainer(
|
| suppress_chevron_(false),
|
| resize_amount_(0),
|
| animation_target_size_(0),
|
| - task_factory_(this),
|
| show_menu_task_factory_(this) {
|
| set_id(VIEW_ID_BROWSER_ACTION_TOOLBAR);
|
|
|
| @@ -197,12 +196,12 @@ void BrowserActionsContainer::Init() {
|
| SetContainerWidth();
|
| }
|
|
|
| -BrowserActionView* BrowserActionsContainer::GetBrowserActionView(
|
| - ExtensionAction* action) {
|
| - for (BrowserActionViews::iterator i(browser_action_views_.begin());
|
| - i != browser_action_views_.end(); ++i) {
|
| - if ((*i)->extension_action() == action)
|
| - return *i;
|
| +BrowserActionView* BrowserActionsContainer::GetViewForExtension(
|
| + const Extension* extension) {
|
| + for (BrowserActionViews::iterator view = browser_action_views_.begin();
|
| + view != browser_action_views_.end(); ++view) {
|
| + if ((*view)->extension() == extension)
|
| + return *view;
|
| }
|
| return NULL;
|
| }
|
| @@ -420,10 +419,6 @@ bool BrowserActionsContainer::CanDrop(const OSExchangeData& data) {
|
| return BrowserActionDragData::CanDrop(data, profile_);
|
| }
|
|
|
| -void BrowserActionsContainer::OnDragEntered(
|
| - const ui::DropTargetEvent& event) {
|
| -}
|
| -
|
| int BrowserActionsContainer::OnDragUpdated(
|
| const ui::DropTargetEvent& event) {
|
| // First check if we are above the chevron (overflow) menu.
|
| @@ -672,14 +667,6 @@ extensions::ActiveTabPermissionGranter*
|
| active_tab_permission_granter();
|
| }
|
|
|
| -void BrowserActionsContainer::MoveBrowserAction(const std::string& extension_id,
|
| - size_t new_index) {
|
| - const Extension* extension = extensions::ExtensionRegistry::Get(profile_)->
|
| - enabled_extensions().GetByID(extension_id);
|
| - model_->MoveExtensionIcon(extension, new_index);
|
| - SchedulePaint();
|
| -}
|
| -
|
| size_t BrowserActionsContainer::GetFirstVisibleIconIndex() const {
|
| return in_overflow_mode() ? model_->GetVisibleIconCount() : 0;
|
| }
|
| @@ -1058,17 +1045,6 @@ bool BrowserActionsContainer::ShouldDisplayBrowserAction(
|
| extensions::util::IsIncognitoEnabled(extension->id(), profile_);
|
| }
|
|
|
| -BrowserActionView* BrowserActionsContainer::GetViewForExtension(
|
| - const Extension* extension) {
|
| - for (BrowserActionViews::iterator view = browser_action_views_.begin();
|
| - view != browser_action_views_.end(); ++view) {
|
| - if ((*view)->extension() == extension)
|
| - return *view;
|
| - }
|
| -
|
| - return NULL;
|
| -}
|
| -
|
| size_t BrowserActionsContainer::GetIconCount() const {
|
| if (!model_)
|
| return 0u;
|
|
|