2 files changed, 10 insertions, 27 deletions
diff --git a/chrome/browser/browser_window_controller.h b/chrome/browser/browser_window_controller.h
index 9d99a2e..b757e48 100644
--- a/chrome/browser/browser_window_controller.h
+++ b/chrome/browser/browser_window_controller.h
@@ -17,16 +17,14 @@ class BrowserWindow;
     NSWindowController<NSUserInterfaceValidations> {
  @private
   Browser* browser_;                  // strong
-  BrowserWindow* window_shim_;        // strong
+  BrowserWindow* windowShim_;         // strong
   
-  // Some toolbar items for IB. We can remove these if we stop using IB for
-  // NSToolbar support (it only half works).
-  IBOutlet NSToolbarItem* back_button_;
-  IBOutlet NSToolbarItem* forward_button_;
-  IBOutlet NSToolbarItem* url_bar_;
+  // Views for the toolbar 
+  IBOutlet NSView* toolbarView_;
+  IBOutlet NSTextField* urlBarView_;
   
-  // This will become its own view at some point.
-  IBOutlet NSView* tab_bar_view_;
+  // Views for the tabs
+  IBOutlet NSView* tabBarView_;
 }
 
 // Load the browser window nib and do any Cocoa-specific initialization.
diff --git a/chrome/browser/browser_window_controller.mm b/chrome/browser/browser_window_controller.mm
index bb5b9cc..94ab55b 100644
--- a/chrome/browser/browser_window_controller.mm
+++ b/chrome/browser/browser_window_controller.mm
@@ -14,7 +14,7 @@
 - (id)initWithBrowser:(Browser*)browser {
   if ((self = [super initWithWindowNibName:@"BrowserWindow"])) {
     browser_ = browser;
-    window_shim_ = new BrowserWindowCocoa(self, [self window]);
+    windowShim_ = new BrowserWindowCocoa(self, [self window]);
   }
   return self;
 }
@@ -22,18 +22,17 @@
 - (void)dealloc {
   browser_->CloseAllTabs();
   delete browser_;
-  delete window_shim_;
+  delete windowShim_;
   [super dealloc];
 }
 
 // Access the C++ bridge between the NSWindow and the rest of Chromium
 - (BrowserWindow*)browserWindow {
-  return window_shim_;
+  return windowShim_;
 }
 
 - (void)windowDidLoad {
-  [(NSControl*)[url_bar_ view]
-      setStringValue:@"http://the.interwebs.start.here"];
+  [urlBarView_ setStringValue:@"http://the.interwebs.start.here"];
 }
 
 - (void)destroyBrowser {
@@ -88,18 +87,4 @@
   browser_->ExecuteCommand(tag);
 }
 
-// NSToolbar delegate methods
-
-- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar {
-  return [NSArray arrayWithObjects:[back_button_ itemIdentifier],
-                                   [forward_button_ itemIdentifier],
-                                   [url_bar_ itemIdentifier], nil];
-}
-
-- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar {
-  return [NSArray arrayWithObjects:[back_button_ itemIdentifier],
-                                   [forward_button_ itemIdentifier],
-                                   [url_bar_ itemIdentifier], nil];
-}
-
 @end