summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/tabs
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/views/tabs')
-rw-r--r--chrome/browser/ui/views/tabs/base_tab.cc2
-rw-r--r--chrome/browser/ui/views/tabs/base_tab_strip.cc7
-rw-r--r--chrome/browser/ui/views/tabs/base_tab_strip.h1
-rw-r--r--chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc5
-rw-r--r--chrome/browser/ui/views/tabs/browser_tab_strip_controller.h1
-rw-r--r--chrome/browser/ui/views/tabs/tab_controller.h4
-rw-r--r--chrome/browser/ui/views/tabs/tab_strip_controller.h4
7 files changed, 0 insertions, 24 deletions
diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc
index 79c0189..9368313 100644
--- a/chrome/browser/ui/views/tabs/base_tab.cc
+++ b/chrome/browser/ui/views/tabs/base_tab.cc
@@ -301,8 +301,6 @@ bool BaseTab::OnMousePressed(const views::MouseEvent& event) {
}
} else if (!IsSelected()) {
controller()->SelectTab(this);
- } else if (IsActive()) {
- controller()->ClickActiveTab(this);
}
controller()->MaybeStartDrag(this, event);
}
diff --git a/chrome/browser/ui/views/tabs/base_tab_strip.cc b/chrome/browser/ui/views/tabs/base_tab_strip.cc
index 8178edd..2a980df 100644
--- a/chrome/browser/ui/views/tabs/base_tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/base_tab_strip.cc
@@ -375,13 +375,6 @@ BaseTab* BaseTabStrip::GetTabAt(BaseTab* tab,
return GetTabAtLocal(local_point);
}
-void BaseTabStrip::ClickActiveTab(const BaseTab* tab) const {
- DCHECK(IsActiveTab(tab));
- int index = GetModelIndexOfBaseTab(tab);
- if (controller() && IsValidModelIndex(index))
- controller()->ClickActiveTab(index);
-}
-
void BaseTabStrip::Layout() {
// Only do a layout if our size changed.
if (last_layout_size_ == size())
diff --git a/chrome/browser/ui/views/tabs/base_tab_strip.h b/chrome/browser/ui/views/tabs/base_tab_strip.h
index ff82b58..14254cb 100644
--- a/chrome/browser/ui/views/tabs/base_tab_strip.h
+++ b/chrome/browser/ui/views/tabs/base_tab_strip.h
@@ -133,7 +133,6 @@ class BaseTabStrip : public AbstractTabStripView,
virtual bool EndDrag(bool canceled) OVERRIDE;
virtual BaseTab* GetTabAt(BaseTab* tab,
const gfx::Point& tab_in_tab_coordinates) OVERRIDE;
- virtual void ClickActiveTab(const BaseTab* tab) const OVERRIDE;
// View overrides:
virtual void Layout() OVERRIDE;
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index 299dd7a..b77e496 100644
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -309,11 +309,6 @@ void BrowserTabStripController::CreateNewTab() {
model_->delegate()->AddBlankTab(true);
}
-void BrowserTabStripController::ClickActiveTab(int index) {
- DCHECK(model_->active_index() == index);
- model_->ActiveTabClicked(index);
-}
-
////////////////////////////////////////////////////////////////////////////////
// BrowserTabStripController, TabStripModelObserver implementation:
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
index 31e2af9..47fbad4 100644
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
@@ -63,7 +63,6 @@ class BrowserTabStripController : public TabStripController,
const GURL& url) OVERRIDE;
virtual bool IsCompatibleWith(BaseTabStrip* other) const OVERRIDE;
virtual void CreateNewTab() OVERRIDE;
- virtual void ClickActiveTab(int index) OVERRIDE;
// TabStripModelObserver implementation:
virtual void TabInsertedAt(TabContentsWrapper* contents,
diff --git a/chrome/browser/ui/views/tabs/tab_controller.h b/chrome/browser/ui/views/tabs/tab_controller.h
index 610e353..a95df6c 100644
--- a/chrome/browser/ui/views/tabs/tab_controller.h
+++ b/chrome/browser/ui/views/tabs/tab_controller.h
@@ -65,10 +65,6 @@ class TabController {
virtual BaseTab* GetTabAt(BaseTab* tab,
const gfx::Point& tab_in_tab_coordinates) = 0;
- // Informs that an active tab is selected when already active (ie - clicked
- // when already active/foreground).
- virtual void ClickActiveTab(const BaseTab* tab) const = 0;
-
protected:
virtual ~TabController() {}
};
diff --git a/chrome/browser/ui/views/tabs/tab_strip_controller.h b/chrome/browser/ui/views/tabs/tab_strip_controller.h
index b97ca4a..674431c 100644
--- a/chrome/browser/ui/views/tabs/tab_strip_controller.h
+++ b/chrome/browser/ui/views/tabs/tab_strip_controller.h
@@ -81,10 +81,6 @@ class TabStripController {
// Creates the new tab.
virtual void CreateNewTab() = 0;
-
- // Informs that an active tab is selected when already active (ie - clicked
- // when already active/foreground).
- virtual void ClickActiveTab(int index) = 0;
};
#endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_CONTROLLER_H_