Revert 33758 - Mac: remove hacky way the New Tab button is obtained from the nib.

I added a member variable and an accessor/mutator ... and hooked up that up in
the nib. Changes to BrowserWindow.xib: hook up the New Tab button to
|newTabButton| in TabBar.

BUG=none
TEST=Make sure it builds, runs, and that the New Tab button still works.

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

TBR=viettrungluu@chromium.org
Review URL: http://codereview.chromium.org/465045

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

4 files changed, 10 insertions, 31 deletions

diff --git a/chrome/app/nibs/BrowserWindow.xib b/chrome/app/nibs/BrowserWindow.xib
index ce1373f..5baa20f 100644
--- a/chrome/app/nibs/BrowserWindow.xib
+++ b/chrome/app/nibs/BrowserWindow.xib
@@ -2,10 +2,10 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10C540</string>
+		<string key="IBDocument.SystemVersion">10B504</string>
 		<string key="IBDocument.InterfaceBuilderVersion">740</string>
-		<string key="IBDocument.AppKitVersion">1038.25</string>
-		<string key="IBDocument.HIToolboxVersion">458.00</string>
+		<string key="IBDocument.AppKitVersion">1038.2</string>
+		<string key="IBDocument.HIToolboxVersion">437.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string key="NS.object.0">740</string>
@@ -147,14 +147,6 @@
 					</object>
 					<int key="connectionID">86</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">newTabButton</string>
-						<reference key="source" ref="1029219716"/>
-						<reference key="destination" ref="131944810"/>
-					</object>
-					<int key="connectionID">87</int>
-				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -303,7 +295,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">87</int>
+			<int key="maxID">86</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -376,10 +368,6 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">TabStripView</string>
 					<string key="superclassName">NSView</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">newTabButton</string>
-						<string key="NS.object.0">NSButton</string>
-					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">browser/cocoa/tab_strip_view.h</string>
diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm
index 54b908a..b6f2573 100644
--- a/chrome/browser/cocoa/tab_strip_controller.mm
+++ b/chrome/browser/cocoa/tab_strip_controller.mm
@@ -265,18 +265,17 @@ private:
     bridge_.reset(new TabStripModelObserverBridge(tabModel_, self));
     tabContentsArray_.reset([[NSMutableArray alloc] init]);
     tabArray_.reset([[NSMutableArray alloc] init]);
-
-    // Important note: any non-tab subviews not added to |permanentSubviews_|
-    // (see |-addSubviewToPermanentList:|) will be wiped out.
     permanentSubviews_.reset([[NSMutableArray alloc] init]);
 
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     defaultFavIcon_.reset([rb.GetNSImageNamed(IDR_DEFAULT_FAVICON) retain]);
 
-    // TODO(viettrungluu): WTF? "For some reason, if the view is present in the
-    // nib a priori, it draws correctly. If we create it in code and add it to
-    // the tab view, it draws with all sorts of crazy artifacts."
-    newTabButton_ = [view newTabButton];
+    // Take the only child view present in the nib as the new tab button. For
+    // some reason, if the view is present in the nib apriori, it draws
+    // correctly. If we create it in code and add it to the tab view, it draws
+    // with all sorts of crazy artifacts.
+    newTabButton_ = [[tabView_ subviews] objectAtIndex:0];
+    DCHECK([newTabButton_ isKindOfClass:[NSButton class]]);
     [self addSubviewToPermanentList:newTabButton_];
     [newTabButton_ setTarget:nil];
     [newTabButton_ setAction:@selector(commandDispatch:)];
diff --git a/chrome/browser/cocoa/tab_strip_view.h b/chrome/browser/cocoa/tab_strip_view.h
index c93ea8c..dd8fbd7 100644
--- a/chrome/browser/cocoa/tab_strip_view.h
+++ b/chrome/browser/cocoa/tab_strip_view.h
@@ -12,13 +12,7 @@
 @interface TabStripView : NSView {
  @private
   NSTimeInterval lastMouseUp_;
-
-  // Weak; the following come from the nib.
-  NSButton* newTabButton_;
 }
-
-@property(assign, nonatomic) IBOutlet NSButton* newTabButton;
-
 @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
index f2638dc..398e6a3 100644
--- a/chrome/browser/cocoa/tab_strip_view.mm
+++ b/chrome/browser/cocoa/tab_strip_view.mm
@@ -8,8 +8,6 @@
 
 @implementation TabStripView
 
-@synthesize newTabButton = newTabButton_;
-
 - (id)initWithFrame:(NSRect)frame {
   self = [super initWithFrame:frame];
   if (self) {