Remove traces of a toolbar controller and xib specific to side-tabs, that mock died on the vine. Toolbar is now indented along with the rest of the window content.

BUG=44773
TEST=hidden behind flag, nothing to test.
Review URL: http://codereview.chromium.org/2824021

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

1 files changed, 10 insertions, 2 deletions

diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index 4b57df7..d189313 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -256,7 +256,15 @@
     // and the toolbar view from the nib. The controller will handle
     // registering for the appropriate command state changes from the back-end.
     // Adds the toolbar to the content area.
-    [self initializeToolbarWithBrowser:browser];
+    toolbarController_.reset([[ToolbarController alloc]
+                               initWithModel:browser->toolbar_model()
+                                    commands:browser->command_updater()
+                                     profile:browser->profile()
+                                     browser:browser
+                              resizeDelegate:self]);
+    [toolbarController_ setHasToolbar:[self hasToolbar]
+                       hasLocationBar:[self hasLocationBar]];
+    [[[self window] contentView] addSubview:[toolbarController_ view]];
 
     // Create a sub-controller for the bookmark bar.
     bookmarkBarController_.reset(
@@ -1635,7 +1643,7 @@ willAnimateFromState:(bookmarks::VisualState)oldState
   // Right now, it only switches one direction, which clearly isn't cool.
   // [self initTabStrip:browser_->tabstrip_model()];
   [[self tabStripView] removeFromSuperview];
-  [self initializeToolbarWithBrowser:browser_.get()];
+
 
   [self layoutSubviews];
 }