diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-29 20:16:06 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-29 20:16:06 +0000 |
| commit | 94f957511b1a940454516a43acb730350fc6cad8 (patch) | |
| tree | 969e231464c753a75f22314515f3f4142dab5f74 /chrome/browser | |
| parent | f81d314c0f2402e3b333baec567c6877e33e6258 (diff) | |
| download | chromium_src-94f957511b1a940454516a43acb730350fc6cad8.zip chromium_src-94f957511b1a940454516a43acb730350fc6cad8.tar.gz chromium_src-94f957511b1a940454516a43acb730350fc6cad8.tar.bz2 | |
rest of the rename, accidentally leftout. TBR.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8909 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser_window_controller.h | 4 | ||||
| -rw-r--r-- | chrome/browser/browser_window_controller.mm | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/browser_window_controller.h b/chrome/browser/browser_window_controller.h index f79cd4e..7db33db 100644 --- a/chrome/browser/browser_window_controller.h +++ b/chrome/browser/browser_window_controller.h @@ -12,7 +12,7 @@ class Browser; class BrowserWindow; -@class TabBarView; +@class TabStripView; @class TabContentsController; @class TabStripController; @@ -25,7 +25,7 @@ class BrowserWindow; TabContentsController* contentsController_; IBOutlet NSBox* contentBox_; - IBOutlet TabBarView* tabBarView_; + IBOutlet TabStripView* tabStripView_; // Views for the toolbar IBOutlet NSView* toolbarView_; diff --git a/chrome/browser/browser_window_controller.mm b/chrome/browser/browser_window_controller.mm index 33892a3..a4d546d 100644 --- a/chrome/browser/browser_window_controller.mm +++ b/chrome/browser/browser_window_controller.mm @@ -5,7 +5,7 @@ #import "chrome/browser/browser.h" #import "chrome/browser/browser_window_cocoa.h" #import "chrome/browser/browser_window_controller.h" -#import "chrome/browser/cocoa/tab_bar_view.h" +#import "chrome/browser/cocoa/tab_strip_view.h" #import "chrome/browser/cocoa/tab_strip_controller.h" @implementation BrowserWindowController @@ -43,15 +43,15 @@ // managing the creation of new tabs. tabStripController_ = [[TabStripController alloc] - initWithView:tabBarView_ model:browser_->tabstrip_model()]; + initWithView:tabStripView_ model:browser_->tabstrip_model()]; // Place the tab bar above the content box and add it to the view hierarchy // as a sibling of the content view so it can overlap with the window frame. NSRect tabFrame = [contentBox_ frame]; tabFrame.origin = NSMakePoint(0, NSMaxY(tabFrame)); - tabFrame.size.height = NSHeight([tabBarView_ frame]); - [tabBarView_ setFrame:tabFrame]; - [[[[self window] contentView] superview] addSubview:tabBarView_]; + tabFrame.size.height = NSHeight([tabStripView_ frame]); + [tabStripView_ setFrame:tabFrame]; + [[[[self window] contentView] superview] addSubview:tabStripView_]; } - (void)destroyBrowser { |