diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 21:20:54 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 21:20:54 +0000 |
| commit | 1a242c311da93e0458808816d5212805e7b93464 (patch) | |
| tree | 6cecde28259a1ae051436f44f1f23e9a69be276d /chrome/browser/cocoa | |
| parent | 12d1d395df66090ce37a8719040bf9c096636330 (diff) | |
| download | chromium_src-1a242c311da93e0458808816d5212805e7b93464.zip chromium_src-1a242c311da93e0458808816d5212805e7b93464.tar.gz chromium_src-1a242c311da93e0458808816d5212805e7b93464.tar.bz2 | |
Adjusts tab strip model to deal with app tabs. There were a couple of
places where I left them using the variable with pinned when it should
be app because those places need to be radically whacked. I'll do that
next.
BUG=32845
TEST=none yet
Review URL: http://codereview.chromium.org/555173
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37880 0039d316-1c4b-4281-b951-d872f2087c98
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]; } } |