rename from tab_bar to tab_strip to be more consistent with windows

Review URL: http://codereview.chromium.org/19473

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8905 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 24 insertions, 23 deletions

diff --git a/chrome/browser/cocoa/tab_bar_view.h b/chrome/browser/cocoa/tab_bar_view.h
deleted file mode 100644
index eb15708..0000000
--- a/chrome/browser/cocoa/tab_bar_view.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2009 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.
-
-#ifndef CHROME_BROWSER_COCOA_TAB_BAR_VIEW_H_
-#define CHROME_BROWSER_COCOA_TAB_BAR_VIEW_H_
-
-#import <Cocoa/Cocoa.h>
-
-// A view class that handles rendering the tab bar
-
-@interface TabBarView : NSView {
-}
-@end
-
-#endif  // CHROME_BROWSER_COCOA_TAB_BAR_VIEW_H_
diff --git a/chrome/browser/cocoa/tab_strip_controller.h b/chrome/browser/cocoa/tab_strip_controller.h
index 85cce9f..f1a4eb4 100644
--- a/chrome/browser/cocoa/tab_strip_controller.h
+++ b/chrome/browser/cocoa/tab_strip_controller.h
@@ -7,7 +7,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-@class TabBarView;
+@class TabStripView;
 class TabStripBridge;
 class TabStripModel;
 
@@ -23,7 +23,7 @@ class TabStripModel;
 
 @interface TabStripController : NSObject {
  @private
-  TabBarView* tabView_;  // weak
+  TabStripView* tabView_;  // weak
   NSButton* newTabButton_;
   TabStripBridge* bridge_;
   TabStripModel* model_;
@@ -33,7 +33,7 @@ class TabStripModel;
 }
 
 // Initialize the controller with a view and model. Both must be non-nil.
-- (id)initWithView:(TabBarView*)view model:(TabStripModel*)model;
+- (id)initWithView:(TabStripView*)view model:(TabStripModel*)model;
 
 @end
 
diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm
index 9bd5fc5..cc491ff 100644
--- a/chrome/browser/cocoa/tab_strip_controller.mm
+++ b/chrome/browser/cocoa/tab_strip_controller.mm
@@ -5,7 +5,7 @@
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 
 #import "chrome/app/chrome_dll_resource.h"
-#import "chrome/browser/cocoa/tab_bar_view.h"
+#import "chrome/browser/cocoa/tab_strip_view.h"
 #import "chrome/browser/cocoa/tab_cell.h"
 #import "chrome/browser/cocoa/tab_contents_controller.h"
 #import "chrome/browser/tabs/tab_strip_model.h"
@@ -52,7 +52,7 @@ class TabStripBridge : public TabStripModelObserver {
 
 @implementation TabStripController
 
-- (id)initWithView:(TabBarView*)view model:(TabStripModel*)model {
+- (id)initWithView:(TabStripView*)view model:(TabStripModel*)model {
   DCHECK(view && model);
   if ((self = [super init])) {
     tabView_ = view;
@@ -66,6 +66,7 @@ class TabStripBridge : public TabStripModelObserver {
     NSRect frame = NSMakeRect(0, 0, [image size].width, [image size].height);
     newTabButton_ = [[NSButton alloc] initWithFrame:frame];
     [newTabButton_ setImage:image];
+    [newTabButton_ setImagePosition:NSImageOnly];
     [newTabButton_ setTarget:nil];
     [newTabButton_ setAction:@selector(commandDispatch:)];
     [newTabButton_ setTag:IDC_NEW_TAB];
diff --git a/chrome/browser/cocoa/tab_strip_view.h b/chrome/browser/cocoa/tab_strip_view.h
new file mode 100644
index 0000000..2f2d1d0
--- /dev/null
+++ b/chrome/browser/cocoa/tab_strip_view.h
@@ -0,0 +1,16 @@
+// Copyright (c) 2009 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.
+
+#ifndef CHROME_BROWSER_COCOA_TAB_STRIP_VIEW_H_
+#define CHROME_BROWSER_COCOA_TAB_STRIP_VIEW_H_
+
+#import <Cocoa/Cocoa.h>
+
+// A view class that handles rendering the tab strip
+
+@interface TabStripView : NSView {
+}
+@end
+
+#endif  // CHROME_BROWSER_COCOA_TAB_STRIP_VIEW_H_
diff --git a/chrome/browser/cocoa/tab_bar_view.mm b/chrome/browser/cocoa/tab_strip_view.mm
index 31deaba..b54ef9d 100644
--- a/chrome/browser/cocoa/tab_bar_view.mm
+++ b/chrome/browser/cocoa/tab_strip_view.mm
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/cocoa/tab_bar_view.h"
+#include "chrome/browser/cocoa/tab_strip_view.h"
 
-@implementation TabBarView
+@implementation TabStripView
 
 - (id)initWithFrame:(NSRect)frame {
   self = [super initWithFrame:frame];