diff options
Diffstat (limited to 'chrome/browser/cocoa')
| -rw-r--r-- | chrome/browser/cocoa/tab_strip_controller.mm | 3 | ||||
| -rw-r--r-- | chrome/browser/cocoa/tab_strip_model_observer_bridge.h | 3 | ||||
| -rw-r--r-- | chrome/browser/cocoa/tab_strip_model_observer_bridge.mm | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm index 2ee7d55..876f56a 100644 --- a/chrome/browser/cocoa/tab_strip_controller.mm +++ b/chrome/browser/cocoa/tab_strip_controller.mm @@ -465,7 +465,8 @@ private: // Ask the model for the number of pinned tabs. Note that tabs which are in // the process of closing (i.e., whose controllers are in // |closingControllers_|) have already been removed from the model. - return static_cast<NSInteger>(tabStripModel_->IndexOfFirstNonPinnedTab()); + // TODO: convert to apps. + return 0; } // (Private) Returns the number of open, unpinned tabs. diff --git a/chrome/browser/cocoa/tab_strip_model_observer_bridge.h b/chrome/browser/cocoa/tab_strip_model_observer_bridge.h index a052344..fc608fc 100644 --- a/chrome/browser/cocoa/tab_strip_model_observer_bridge.h +++ b/chrome/browser/cocoa/tab_strip_model_observer_bridge.h @@ -33,8 +33,7 @@ class TabStripModelObserverBridge : public TabStripModelObserver { bool user_gesture); virtual void TabMoved(TabContents* contents, int from_index, - int to_index, - bool pinned_state_changed); + int to_index); virtual void TabChangedAt(TabContents* contents, int index, TabChangeType change_type); virtual void TabPinnedStateChanged(TabContents* contents, int index); diff --git a/chrome/browser/cocoa/tab_strip_model_observer_bridge.mm b/chrome/browser/cocoa/tab_strip_model_observer_bridge.mm index e3f2c02..87051c0 100644 --- a/chrome/browser/cocoa/tab_strip_model_observer_bridge.mm +++ b/chrome/browser/cocoa/tab_strip_model_observer_bridge.mm @@ -61,14 +61,14 @@ void TabStripModelObserverBridge::TabSelectedAt(TabContents* old_contents, void TabStripModelObserverBridge::TabMoved(TabContents* contents, int from_index, - int to_index, - bool pinned_state_changed) { + int to_index) { if ([controller_ respondsToSelector: @selector(tabMovedWithContents:fromIndex:toIndex:pinnedStateChanged:)]) { + // TODO: clean this up, need to remove pinnedStateChanged param. [controller_ tabMovedWithContents:contents fromIndex:from_index toIndex:to_index - pinnedStateChanged:(pinned_state_changed ? YES : NO)]; + pinnedStateChanged:NO]; } } |