diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-13 23:48:48 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-13 23:48:48 +0000 |
| commit | c8db09166db6e7a112852477c7595ee7fd7986b2 (patch) | |
| tree | b21bc6823ea431291c2ae2a893b1295950d50f69 /chrome/browser/views | |
| parent | 1e3927d3ff39ed2f4407b08c5740dafc41a72a80 (diff) | |
| download | chromium_src-c8db09166db6e7a112852477c7595ee7fd7986b2.zip chromium_src-c8db09166db6e7a112852477c7595ee7fd7986b2.tar.gz chromium_src-c8db09166db6e7a112852477c7595ee7fd7986b2.tar.bz2 | |
Nukes the 3 arg TabMoved variant in favor of the 4 arg variant.
BUG=16634
TEST=none
Review URL: http://codereview.chromium.org/155441
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/tabs/browser_tab_strip.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/browser_tab_strip.h | 3 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/tab_overview_controller.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/tab_overview_controller.h | 3 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/tab_strip.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/tab_strip.h | 3 |
6 files changed, 12 insertions, 6 deletions
diff --git a/chrome/browser/views/tabs/browser_tab_strip.cc b/chrome/browser/views/tabs/browser_tab_strip.cc index 86bbd09..64dec1e 100644 --- a/chrome/browser/views/tabs/browser_tab_strip.cc +++ b/chrome/browser/views/tabs/browser_tab_strip.cc @@ -129,7 +129,8 @@ void BrowserTabStrip::TabSelectedAt(TabContents* old_contents, void BrowserTabStrip::TabMoved(TabContents* contents, int from_index, - int to_index) { + int to_index, + bool pinned_state_changed) { TabStrip2::MoveTabAt(from_index, to_index); } diff --git a/chrome/browser/views/tabs/browser_tab_strip.h b/chrome/browser/views/tabs/browser_tab_strip.h index 061645f..8936b45 100644 --- a/chrome/browser/views/tabs/browser_tab_strip.h +++ b/chrome/browser/views/tabs/browser_tab_strip.h @@ -37,7 +37,8 @@ class BrowserTabStrip : public TabStrip2, TabContents* contents, int index, bool user_gesture); - virtual void TabMoved(TabContents* contents, int from_index, int to_index); + virtual void TabMoved(TabContents* contents, int from_index, int to_index, + bool pinned_state_changed); virtual void TabChangedAt(TabContents* contents, int index); // Overridden from TabStrip2Model: diff --git a/chrome/browser/views/tabs/tab_overview_controller.cc b/chrome/browser/views/tabs/tab_overview_controller.cc index f887fe9..853cdc5 100644 --- a/chrome/browser/views/tabs/tab_overview_controller.cc +++ b/chrome/browser/views/tabs/tab_overview_controller.cc @@ -251,7 +251,8 @@ void TabOverviewController::TabDetachedAt(TabContents* contents, int index) { void TabOverviewController::TabMoved(TabContents* contents, int from_index, - int to_index) { + int to_index, + bool pinned_state_changed) { if (!grid_->modifying_model()) grid_->CancelDrag(); diff --git a/chrome/browser/views/tabs/tab_overview_controller.h b/chrome/browser/views/tabs/tab_overview_controller.h index ce5f0f7..b71ba71 100644 --- a/chrome/browser/views/tabs/tab_overview_controller.h +++ b/chrome/browser/views/tabs/tab_overview_controller.h @@ -90,7 +90,8 @@ class TabOverviewController : public TabStripModelObserver { virtual void TabDetachedAt(TabContents* contents, int index); virtual void TabMoved(TabContents* contents, int from_index, - int to_index); + int to_index, + bool pinned_state_changed); virtual void TabChangedAt(TabContents* contents, int index, bool loading_only); virtual void TabStripEmpty(); diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 37fdaec..dc9e91f 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -824,7 +824,8 @@ void TabStrip::TabSelectedAt(TabContents* old_contents, } } -void TabStrip::TabMoved(TabContents* contents, int from_index, int to_index) { +void TabStrip::TabMoved(TabContents* contents, int from_index, int to_index, + bool pinned_state_changed) { Tab* tab = GetTabAt(from_index); tab_data_.erase(tab_data_.begin() + from_index); TabData data = {tab, gfx::Rect()}; diff --git a/chrome/browser/views/tabs/tab_strip.h b/chrome/browser/views/tabs/tab_strip.h index 0e25248..08ad39b 100644 --- a/chrome/browser/views/tabs/tab_strip.h +++ b/chrome/browser/views/tabs/tab_strip.h @@ -97,7 +97,8 @@ class TabStrip : public views::View, TabContents* contents, int index, bool user_gesture); - virtual void TabMoved(TabContents* contents, int from_index, int to_index); + virtual void TabMoved(TabContents* contents, int from_index, int to_index, + bool pinned_state_changed); virtual void TabChangedAt(TabContents* contents, int index, bool loading_only); |