On Mac, ensure messages displayed in the bookmark bar do not overlap with the Apps bookmark button.

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

 // Copyright (c) 2012 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_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 1369 matching lines @@
           [buttons_ objectAtIndex:static_cast<NSUInteger>(index)];
       if ([button showsBorderOnlyWhileMouseInside]) {
         [button setShowsBorderOnlyWhileMouseInside:NO];
         [button setShowsBorderOnlyWhileMouseInside:YES];
       }
     }
   }
 }
 
 
-// Adjust the horizontal width and the visibility of the "For quick access"
-// text field and "Import bookmarks..." button based on the current width
-// of the containing |buttonView_| (which is affected by window width).
-- (void)adjustNoItemContainerWidthsForMaxX:(CGFloat)maxViewX {
+// Adjust the horizontal width, x position and the visibility of the "For quick
+// access" text field and "Import bookmarks..." button based on the current
+// width of the containing |buttonView_| (which is affected by window width).
+- (void)adjustNoItemContainerForMaxX:(CGFloat)maxViewX {
   if (![[buttonView_ noItemContainer] isHidden]) {
     // Reset initial frames for the two items, then adjust as necessary.
     NSTextField* noItemTextfield = [buttonView_ noItemTextfield];
-    [noItemTextfield setFrame:originalNoItemsRect_];
+    NSRect noItemsRect = originalNoItemsRect_;
+    NSRect importBookmarksRect = originalImportBookmarksRect_;
+    if (![appsPageShortcutButton_ isHidden]) {
+      float width = NSWidth([appsPageShortcutButton_ frame]);
+      noItemsRect.origin.x += width;
+      importBookmarksRect.origin.x += width;
+    }
+    [noItemTextfield setFrame:noItemsRect];
     [noItemTextfield setHidden:NO];
     NSButton* importBookmarksButton = [buttonView_ importBookmarksButton];
-    [importBookmarksButton setFrame:originalImportBookmarksRect_];
+    [importBookmarksButton setFrame:importBookmarksRect];
     [importBookmarksButton setHidden:NO];
     // Check each to see if they need to be shrunk or hidden.
     if ([self shrinkOrHideView:importBookmarksButton forMaxX:maxViewX])
       [self shrinkOrHideView:noItemTextfield forMaxX:maxViewX];
   }
 }
 
 // Scans through all buttons from left to right, calculating from scratch where
 // they should be based on the preceding widths, until it finds the one
 // requested.
@@ skipping 100 matching lines @@
       break;
     }
     ++displayedButtonCount_;
     [buttons_ addObject:button];
     [buttonView_ addSubview:button];
   }
 
   // While we're here, adjust the horizontal width and the visibility
   // of the "For quick access" and "Import bookmarks..." text fields.
   if (![buttons_ count])
-    [self adjustNoItemContainerWidthsForMaxX:maxViewX];
+    [self adjustNoItemContainerForMaxX:maxViewX];
 }
 
 #pragma mark Private Methods Exposed for Testing
 
 - (BookmarkBarView*)buttonView {
   return buttonView_;
 }
 
 - (NSMutableArray*)buttons {
   return buttons_.get();
 }
 
 - (NSButton*)offTheSideButton {
   return offTheSideButton_;
 }
 
+- (NSButton*)appsPageShortcutButton {
+  return appsPageShortcutButton_;
+}
+
 - (BOOL)offTheSideButtonIsHidden {
   return [offTheSideButton_ isHidden];
 }
 
+- (BOOL)appsPageShortcutButtonIsHidden {
+  return [appsPageShortcutButton_ isHidden];
+}
+
 - (BookmarkButton*)otherBookmarksButton {
   return otherBookmarksButton_.get();
 }
 
 - (BookmarkBarFolderController*)folderController {
   return folderController_;
 }
 
 - (id)folderTarget {
   return folderTarget_.get();
@@ skipping 1110 matching lines @@
 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
     (const BookmarkNode*)node {
   // See if it's in the bar, then if it is in the hierarchy of visible
   // folder menus.
   if (bookmarkModel_->bookmark_bar_node() == node)
     return self;
   return [folderController_ controllerForNode:node];
 }
 
 @end