From 7497d26c7068cd0f193847464e1a610f8183ea8c Mon Sep 17 00:00:00 2001
From: "pinkerton@chromium.org"
<pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 29 Jan 2009 20:05:47 +0000
Subject: 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
---
chrome/browser/cocoa/tab_bar_view.h | 16 -------------
chrome/browser/cocoa/tab_bar_view.mm | 36 ----------------------------
chrome/browser/cocoa/tab_strip_controller.h | 6 ++---
chrome/browser/cocoa/tab_strip_controller.mm | 5 ++--
chrome/browser/cocoa/tab_strip_view.h | 16 +++++++++++++
chrome/browser/cocoa/tab_strip_view.mm | 36 ++++++++++++++++++++++++++++
6 files changed, 58 insertions(+), 57 deletions(-)
delete mode 100644 chrome/browser/cocoa/tab_bar_view.h
delete mode 100644 chrome/browser/cocoa/tab_bar_view.mm
create mode 100644 chrome/browser/cocoa/tab_strip_view.h
create mode 100644 chrome/browser/cocoa/tab_strip_view.mm
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_bar_view.mm b/chrome/browser/cocoa/tab_bar_view.mm
deleted file mode 100644
index 31deaba..0000000
--- a/chrome/browser/cocoa/tab_bar_view.mm
+++ /dev/null
@@ -1,36 +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.
-
-#include "chrome/browser/cocoa/tab_bar_view.h"
-
-@implementation TabBarView
-
-- (id)initWithFrame:(NSRect)frame {
- self = [super initWithFrame:frame];
- if (self) {
- // Nothing yet to do here...
- }
- return self;
-}
-
-- (void)drawRect:(NSRect)rect {
- rect = [self bounds];
- BOOL isKey = [[self window] isKeyWindow];
- if (isKey) {
- NSGradient *gradient =
- [[[NSGradient alloc] initWithStartingColor:
- [NSColor colorWithCalibratedWhite:0.0 alpha:0.0]
- endingColor:
- [NSColor colorWithCalibratedWhite:0.0 alpha:0.05]] autorelease];
- [gradient drawInRect:[self bounds] angle:270.0];
- }
-
- NSRect borderRect, contentRect;
- NSDivideRect(rect, &borderRect, &contentRect, 1, NSMinYEdge);
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.2] set];
-
- NSRectFillUsingOperation(borderRect, NSCompositeSourceOver);
-}
-
-@end
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_strip_view.mm b/chrome/browser/cocoa/tab_strip_view.mm
new file mode 100644
index 0000000..b54ef9d
--- /dev/null
+++ b/chrome/browser/cocoa/tab_strip_view.mm
@@ -0,0 +1,36 @@
+// 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.
+
+#include "chrome/browser/cocoa/tab_strip_view.h"
+
+@implementation TabStripView
+
+- (id)initWithFrame:(NSRect)frame {
+ self = [super initWithFrame:frame];
+ if (self) {
+ // Nothing yet to do here...
+ }
+ return self;
+}
+
+- (void)drawRect:(NSRect)rect {
+ rect = [self bounds];
+ BOOL isKey = [[self window] isKeyWindow];
+ if (isKey) {
+ NSGradient *gradient =
+ [[[NSGradient alloc] initWithStartingColor:
+ [NSColor colorWithCalibratedWhite:0.0 alpha:0.0]
+ endingColor:
+ [NSColor colorWithCalibratedWhite:0.0 alpha:0.05]] autorelease];
+ [gradient drawInRect:[self bounds] angle:270.0];
+ }
+
+ NSRect borderRect, contentRect;
+ NSDivideRect(rect, &borderRect, &contentRect, 1, NSMinYEdge);
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.2] set];
+
+ NSRectFillUsingOperation(borderRect, NSCompositeSourceOver);
+}
+
+@end
--
cgit v1.1