summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/browser.cc3
-rw-r--r--chrome/browser/browser.h3
-rw-r--r--chrome/browser/cocoa/tab_strip_model_observer_bridge.h3
-rw-r--r--chrome/browser/cocoa/tab_strip_model_observer_bridge.mm3
-rw-r--r--chrome/browser/extensions/extension_browser_event_router.cc7
-rw-r--r--chrome/browser/extensions/extension_browser_event_router.h3
-rw-r--r--chrome/browser/tabs/tab_strip_model.h10
-rw-r--r--chrome/browser/views/tabs/browser_tab_strip.cc3
-rw-r--r--chrome/browser/views/tabs/browser_tab_strip.h3
-rw-r--r--chrome/browser/views/tabs/tab_overview_controller.cc3
-rw-r--r--chrome/browser/views/tabs/tab_overview_controller.h3
-rw-r--r--chrome/browser/views/tabs/tab_strip.cc3
-rw-r--r--chrome/browser/views/tabs/tab_strip.h3
13 files changed, 27 insertions, 23 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 6568032..cbda922 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1671,7 +1671,8 @@ void Browser::TabSelectedAt(TabContents* old_contents,
void Browser::TabMoved(TabContents* contents,
int from_index,
- int to_index) {
+ int to_index,
+ bool pinned_state_changed) {
DCHECK(from_index >= 0 && to_index >= 0);
// Notify the history service.
SyncHistoryWithTabs(std::min(from_index, to_index));
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index b581f40..48fa93e 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -449,7 +449,8 @@ class Browser : public TabStripModelDelegate,
bool user_gesture);
virtual void TabMoved(TabContents* contents,
int from_index,
- int to_index);
+ int to_index,
+ bool pinned_state_changed);
virtual void TabStripEmpty();
// Overridden from TabContentsDelegate:
diff --git a/chrome/browser/cocoa/tab_strip_model_observer_bridge.h b/chrome/browser/cocoa/tab_strip_model_observer_bridge.h
index e31dd59..1934979 100644
--- a/chrome/browser/cocoa/tab_strip_model_observer_bridge.h
+++ b/chrome/browser/cocoa/tab_strip_model_observer_bridge.h
@@ -33,7 +33,8 @@ class TabStripModelObserverBridge : public TabStripModelObserver {
bool user_gesture);
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/cocoa/tab_strip_model_observer_bridge.mm b/chrome/browser/cocoa/tab_strip_model_observer_bridge.mm
index 1eee36c..8a306ab 100644
--- a/chrome/browser/cocoa/tab_strip_model_observer_bridge.mm
+++ b/chrome/browser/cocoa/tab_strip_model_observer_bridge.mm
@@ -61,7 +61,8 @@ void TabStripModelObserverBridge::TabSelectedAt(TabContents* old_contents,
void TabStripModelObserverBridge::TabMoved(TabContents* contents,
int from_index,
- int to_index) {
+ int to_index,
+ bool pinned_state_changed) {
if ([controller_ respondsToSelector:
@selector(tabMovedWithContents:fromIndex:toIndex:)]) {
[controller_ tabMovedWithContents:contents
diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc
index 2c0b712..3bd807a 100644
--- a/chrome/browser/extensions/extension_browser_event_router.cc
+++ b/chrome/browser/extensions/extension_browser_event_router.cc
@@ -150,9 +150,9 @@ void ExtensionBrowserEventRouter::TabCreatedAt(TabContents* contents,
registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
Source<NavigationController>(&contents->controller()));
-
+
// Observing TAB_CONTENTS_DESTROYED is necessary because it's
- // possible for tabs to be created, detached and then destroyed without
+ // possible for tabs to be created, detached and then destroyed without
// ever having been re-attached and closed. This happens in the case of
// a devtools TabContents that is opened in window, docked, then closed.
registrar_.Add(this, NotificationType::TAB_CONTENTS_DESTROYED,
@@ -254,7 +254,8 @@ void ExtensionBrowserEventRouter::TabSelectedAt(TabContents* old_contents,
void ExtensionBrowserEventRouter::TabMoved(TabContents* contents,
int from_index,
- int to_index) {
+ int to_index,
+ bool pinned_state_changed) {
ListValue args;
args.Append(Value::CreateIntegerValue(ExtensionTabUtil::GetTabId(contents)));
diff --git a/chrome/browser/extensions/extension_browser_event_router.h b/chrome/browser/extensions/extension_browser_event_router.h
index a134169..0cfd075 100644
--- a/chrome/browser/extensions/extension_browser_event_router.h
+++ b/chrome/browser/extensions/extension_browser_event_router.h
@@ -43,7 +43,8 @@ class ExtensionBrowserEventRouter : public TabStripModelObserver,
TabContents* new_contents,
int index,
bool user_gesture);
- void TabMoved(TabContents* contents, int from_index, int to_index);
+ void TabMoved(TabContents* contents, int from_index, int to_index,
+ bool pinned_state_changed);
void TabChangedAt(TabContents* contents, int index, bool loading_only);
void TabStripEmpty();
diff --git a/chrome/browser/tabs/tab_strip_model.h b/chrome/browser/tabs/tab_strip_model.h
index 53ff04f..069d7f4 100644
--- a/chrome/browser/tabs/tab_strip_model.h
+++ b/chrome/browser/tabs/tab_strip_model.h
@@ -72,20 +72,12 @@ class TabStripModelObserver {
int index,
bool user_gesture) { }
- // The specified TabContents at |from_index| was moved to |to_index|.
- // TODO(sky): nuke and convert all to 4 arg variant.
- virtual void TabMoved(TabContents* contents,
- int from_index,
- int to_index) { }
-
// The specified TabContents at |from_index| was moved to |to_index|. If
// the pinned state of the tab is changing |pinned_state_changed| is true.
virtual void TabMoved(TabContents* contents,
int from_index,
int to_index,
- bool pinned_state_changed) {
- TabMoved(contents, from_index, to_index);
- }
+ bool pinned_state_changed) { }
// The specified TabContents at |index| changed in some way. |contents| may
// be an entirely different object and the old value is no longer available
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);
generated by cgit v1.1 at 2025-02-02 10:05:21 +0000