Revert of [Mac] Refactor bookmark bar controller

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm

 // Copyright (c) 2011 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.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h"
 
 #include "base/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/themes/theme_properties.h"
 #import "chrome/browser/themes/theme_service.h"
@@ skipping 10 matching lines @@
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #include "ui/base/clipboard/clipboard_util_mac.h"
 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 using base::UserMetricsAction;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
-static const CGFloat kInitialElementYOrigin = 7;
+static const CGFloat kInitialContainerWidth = 596;
+static const CGFloat kInitialContainerHeight = 41;
+static const CGFloat kInitialElementYOrigin = 20;
 static const CGFloat kInitialElementHeight = 14;
 static const CGFloat kInitialTextFieldXOrigin = 5;
+// static const CGFloat kInitialTextFieldWidth = 167;
 static const CGFloat kTextFieldTrailingPadding = 5;
+// static const CGFloat kInitialButtonWidth = 199;
 
 @interface BookmarkBarView (Private)
 - (void)themeDidChangeNotification:(NSNotification*)aNotification;
 - (void)updateTheme:(const ui::ThemeProvider*)themeProvider;
 
 // NSView override.
 - (void)setFrameSize:(NSSize)size;
 @end
 
 @implementation BookmarkBarView
@@ skipping 24 matching lines @@
 }
 
 - (instancetype)initWithController:(BookmarkBarController*)controller
                              frame:(NSRect)frame {
   DCHECK(controller) << "Controller shouldn't be nil";
   if (self = [super initWithFrame:frame]) {
     controller_ = controller;
 
     NSFont* smallSystemFont =
         [NSFont systemFontOfSize:[NSFont smallSystemFontSize]];
+    noItemContainer_.reset(
+        [[NSView alloc] initWithFrame:NSMakeRect(0, 0, kInitialContainerWidth,
+                                                 kInitialContainerHeight)]);
+    [noItemContainer_ setAutoresizingMask:NSViewMaxXMargin];
+    [noItemContainer_ setAutoresizingMask:NSViewWidthSizable];
 
-    noItemTextField_.reset([[NSTextField alloc]
+    noItemTextfield_.reset([[NSTextField alloc]
         initWithFrame:NSMakeRect(kInitialTextFieldXOrigin,
                                  kInitialElementYOrigin, CGFLOAT_MAX,
                                  kInitialElementHeight)]);
-    [noItemTextField_ setFont:smallSystemFont];
-    [noItemTextField_
+    [noItemTextfield_ setAutoresizingMask:NSViewWidthSizable];
+    [noItemTextfield_ setFont:smallSystemFont];
+    [noItemTextfield_
         setStringValue:l10n_util::GetNSString(IDS_BOOKMARKS_NO_ITEMS)];
-    [noItemTextField_ setEditable:NO];
+    [noItemTextfield_ setEditable:NO];
 
-    [noItemTextField_ setBordered:NO];
-    [[noItemTextField_ cell] setLineBreakMode:NSLineBreakByTruncatingTail];
+    [noItemTextfield_ setBordered:NO];
+    [[noItemTextfield_ cell] setLineBreakMode:NSLineBreakByTruncatingTail];
 
-    [noItemTextField_ setTextColor:[NSColor controlTextColor]];
-    [noItemTextField_ setBackgroundColor:[NSColor controlColor]];
+    [noItemTextfield_ setTextColor:[NSColor controlTextColor]];
+    [noItemTextfield_ setBackgroundColor:[NSColor controlColor]];
 
-    [noItemTextField_ setDrawsBackground:NO];
-    [noItemTextField_ setTextColor:[NSColor controlTextColor]];
-    [noItemTextField_ setBackgroundColor:[NSColor controlColor]];
-    [noItemTextField_ sizeToFit];
+    [noItemTextfield_ setDrawsBackground:NO];
+    [noItemTextfield_ setTextColor:[NSColor controlTextColor]];
+    [noItemTextfield_ setBackgroundColor:[NSColor controlColor]];
+    [noItemTextfield_ sizeToFit];
 
     NSButton* importButton = [HyperlinkButtonCell
         buttonWithString:l10n_util::GetNSString(IDS_BOOKMARK_BAR_IMPORT_LINK)];
     importBookmarksButton_.reset([importButton retain]);
     [importBookmarksButton_
-        setFrame:NSMakeRect(NSMaxX([noItemTextField_ frame]) +
+        setFrame:NSMakeRect(NSMaxX([noItemTextfield_ frame]) +
                                 kTextFieldTrailingPadding,
                             kInitialElementYOrigin, CGFLOAT_MAX,
                             kInitialElementHeight)];
+    [importBookmarksButton_ setAutoresizingMask:NSViewMaxXMargin];
     [importBookmarksButton_ setFont:smallSystemFont];
     [importBookmarksButton_ sizeToFit];
+    [noItemContainer_ addSubview:importBookmarksButton_];
 
-    [self addSubview:noItemTextField_];
-    [self addSubview:importBookmarksButton_];
+    [noItemContainer_ addSubview:noItemTextfield_];
+    NSRect containerFrame = [noItemContainer_ frame];
+    containerFrame.size.width = std::max(
+        NSWidth(containerFrame), NSMaxX([importBookmarksButton_ frame]));
+    [noItemContainer_ setFrame:containerFrame];
+
+    [self addSubview:noItemContainer_];
     [self registerForNotificationsAndDraggedTypes];
   }
   return self;
 }
 
 - (void)registerForNotificationsAndDraggedTypes {
   NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
   [defaultCenter addObserver:self
                     selector:@selector(themeDidChangeNotification:)
                         name:kBrowserThemeDidChangeNotification
@@ skipping 27 matching lines @@
 }
 
 // Adapt appearance to the current theme. Called after theme changes and before
 // this is shown for the first time.
 - (void)updateTheme:(const ui::ThemeProvider*)themeProvider {
   if (!themeProvider)
     return;
 
   NSColor* color =
       themeProvider->GetNSColor(ThemeProperties::COLOR_BOOKMARK_TEXT);
-  [noItemTextField_ setTextColor:color];
+  [noItemTextfield_ setTextColor:color];
 }
 
 // Mouse down events on the bookmark bar should not allow dragging the parent
 // window around.
 - (BOOL)mouseDownCanMoveWindow {
   return NO;
 }
 
-- (NSTextField*)noItemTextField {
-  return noItemTextField_;
+- (NSTextField*)noItemTextfield {
+  return noItemTextfield_;
+}
+
+- (NSView*)noItemContainer {
+  return noItemContainer_;
 }
 
 - (NSButton*)importBookmarksButton {
   return importBookmarksButton_;
 }
 
 // Internal method, needs to be called whenever a change has been made to
 // dropIndicatorShown_ or dropIndicatorPosition_ so it can get the controller
 // to reflect the change by moving buttons around.
 - (void)dropIndicatorChanged {
@@ skipping 48 matching lines @@
   // drop indicator if one was shown.
   if (dropIndicatorShown_) {
     dropIndicatorShown_ = NO;
     [self dropIndicatorChanged];
   }
 }
 
 - (void)draggingEnded:(id<NSDraggingInfo>)info {
   [controller_ draggingEnded:info];
 
+  [[BookmarkButton draggedButton] setHidden:NO];
   if (dropIndicatorShown_) {
     dropIndicatorShown_ = NO;
     [self dropIndicatorChanged];
   }
   [controller_ draggingEnded:info];
 }
 
 - (BOOL)wantsPeriodicDraggingUpdates {
   return YES;
 }
@@ skipping 78 matching lines @@
 
 - (NSMenu*)menu {
   return [[controller_ menuController] menuForBookmarkBar];
 }
 
 - (ViewID)viewID {
   return VIEW_ID_BOOKMARK_BAR;
 }
 
 @end  // @implementation BookmarkBarView