diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-12 13:51:27 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-12 13:51:27 +0000 |
| commit | c084925c810975c3050e512c2f4f237d14242f01 (patch) | |
| tree | 1ec0edb28afdb4717b5f3ea926425ef9658359ed /chrome/browser/ui/cocoa | |
| parent | aaacb7ce2b2c5bc57393fc863fd8b5e0d2ec5473 (diff) | |
| download | chromium_src-c084925c810975c3050e512c2f4f237d14242f01.zip chromium_src-c084925c810975c3050e512c2f4f237d14242f01.tar.gz chromium_src-c084925c810975c3050e512c2f4f237d14242f01.tar.bz2 | |
browser: Rename Browser::tabstrip_model to Browser::tab_strip_model.
This was a TODO for me in browser.h
R=ben@chromium.org
TBR=thestig@chromium.org,sky@chromium.org,tim@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10388101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa')
6 files changed, 17 insertions, 17 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index 44d9a81..8c7546e 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -496,7 +496,7 @@ enum { // from this method. - (void)windowWillClose:(NSNotification*)notification { DCHECK_EQ([notification object], [self window]); - DCHECK(browser_->tabstrip_model()->empty()); + DCHECK(browser_->tab_strip_model()->empty()); [savedRegularWindow_ close]; // We delete statusBubble here because we need to kill off the dependency // that its window has on our window before our window goes away. @@ -552,7 +552,7 @@ enum { // have to save the window position before we call orderOut:. [self saveWindowPositionIfNeeded]; - if (!browser_->tabstrip_model()->empty()) { + if (!browser_->tab_strip_model()->empty()) { // Tab strip isn't empty. Hide the frame (so it appears to have closed // immediately) and close all the tabs, allowing the renderers to shut // down. When the tab strip is empty we'll be called back again. @@ -1277,7 +1277,7 @@ enum { // put into a different tab strip, such as during a drop on another window. - (void)detachTabView:(NSView*)view { int index = [tabStripController_ modelIndexForTabView:view]; - browser_->tabstrip_model()->DetachTabContentsAt(index); + browser_->tab_strip_model()->DetachTabContentsAt(index); } - (NSView*)activeTabView { @@ -1338,17 +1338,17 @@ enum { // deleting the tab contents. This needs to come before creating the new // Browser because it clears the WebContents' delegate, which gets hooked // up during creation of the new window. - browser_->tabstrip_model()->DetachTabContentsAt(index); + browser_->tab_strip_model()->DetachTabContentsAt(index); // Create the new window with a single tab in its model, the one being // dragged. DockInfo dockInfo; - Browser* newBrowser = browser_->tabstrip_model()->delegate()-> + Browser* newBrowser = browser_->tab_strip_model()->delegate()-> CreateNewStripWithContents(contents, browserRect, dockInfo, false); // Propagate the tab pinned state of the new tab (which is the only tab in // this new window). - newBrowser->tabstrip_model()->SetTabPinned(0, isPinned); + newBrowser->tab_strip_model()->SetTabPinned(0, isPinned); // Get the new controller by asking the new window for its delegate. BrowserWindowController* controller = @@ -1488,7 +1488,7 @@ enum { } - (BOOL)hasLiveTabs { - return !browser_->tabstrip_model()->empty(); + return !browser_->tab_strip_model()->empty(); } - (NSString*)activeTabTitle { @@ -2174,7 +2174,7 @@ willAnimateFromState:(bookmarks::VisualState)oldState [TabposeWindow openTabposeFor:[self window] rect:activeArea slomo:slomo - tabStripModel:browser_->tabstrip_model()]; + tabStripModel:browser_->tab_strip_model()]; // When the Tabpose window closes, the infobar container needs to be made // visible again. diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm index 4f17c77..bccec1c 100644 --- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm @@ -68,7 +68,7 @@ class FullscreenExitBubbleControllerTest : public CocoaProfileTest { TabContentsWrapper* tab_contents = Browser::TabContentsFactory( profile(), site_instance_, MSG_ROUTING_NONE, NULL, NULL); - browser()->tabstrip_model()->AppendTabContents( + browser()->tab_strip_model()->AppendTabContents( tab_contents, /*foreground=*/true); } diff --git a/chrome/browser/ui/cocoa/tabpose_window_unittest.mm b/chrome/browser/ui/cocoa/tabpose_window_unittest.mm index 49b4804..7ee0906 100644 --- a/chrome/browser/ui/cocoa/tabpose_window_unittest.mm +++ b/chrome/browser/ui/cocoa/tabpose_window_unittest.mm @@ -26,7 +26,7 @@ class TabposeWindowTest : public CocoaProfileTest { TabContentsWrapper* tab_contents = Browser::TabContentsFactory( profile(), site_instance_, MSG_ROUTING_NONE, NULL, NULL); - browser()->tabstrip_model()->AppendTabContents( + browser()->tab_strip_model()->AppendTabContents( tab_contents, /*foreground=*/true); } @@ -50,7 +50,7 @@ TEST_F(TabposeWindowTest, TestShow) { [TabposeWindow openTabposeFor:parent rect:NSMakeRect(10, 20, 250, 160) slomo:NO - tabStripModel:browser()->tabstrip_model()]; + tabStripModel:browser()->tab_strip_model()]; // Should release the window. [window mouseDown:nil]; @@ -70,10 +70,10 @@ TEST_F(TabposeWindowTest, TestModelObserver) { [TabposeWindow openTabposeFor:parent rect:NSMakeRect(10, 20, 250, 160) slomo:NO - tabStripModel:browser()->tabstrip_model()]; + tabStripModel:browser()->tab_strip_model()]; // Exercise all the model change events. - TabStripModel* model = browser()->tabstrip_model(); + TabStripModel* model = browser()->tab_strip_model(); DCHECK_EQ([window thumbnailLayerCount], 3u); DCHECK_EQ([window selectedIndex], 2); diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index 3969589..c1bb28d 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -350,7 +350,7 @@ private: tabStripView_.reset([view retain]); switchView_ = switchView; browser_ = browser; - tabStripModel_ = browser_->tabstrip_model(); + tabStripModel_ = browser_->tab_strip_model(); hoverTabSelector_.reset(new HoverTabSelector(tabStripModel_)); delegate_ = delegate; bridge_.reset(new TabStripModelObserverBridge(tabStripModel_, self)); diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm index 26e40b2..038cbfb 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm @@ -88,7 +88,7 @@ class TabStripControllerTest : public CocoaProfileTest { [tab_strip_ setNewTabButton:new_tab_button.get()]; delegate_.reset(new TestTabStripModelDelegate()); - model_ = browser()->tabstrip_model(); + model_ = browser()->tab_strip_model(); controller_delegate_.reset([TestTabStripControllerDelegate alloc]); controller_.reset([[TabStripController alloc] initWithView:static_cast<TabStripView*>(tab_strip_.get()) diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm index e2fda87..24bb98d 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -26,7 +26,7 @@ class MockWrenchMenuModel : public WrenchMenuModel { // seems that the vector of observers is getting hosed somewhere between // |-[ToolbarController dealloc]| and ~MockWrenchMenuModel(). This line // short-circuits the parent destructor to avoid this crash. - tabstrip_model_ = NULL; + tab_strip_model_ = NULL; } MOCK_METHOD1(ExecuteCommand, void(int command_id)); }; |