[Mac][Material Design] Adjust location of Import Bookmarks textfield.

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 <stddef.h>
 
 #import "base/mac/bundle_locations.h"
 #import "base/mac/foundation_util.h"
@@ skipping 484 matching lines @@
   }
 
   // We are enabled by default.
   barIsEnabled_ = YES;
 
   // Remember the original sizes of the 'no items' and 'import bookmarks'
   // fields to aid in resizing when the window frame changes.
   originalNoItemsRect_ = [[buttonView_ noItemTextfield] frame];
   originalImportBookmarksRect_ = [[buttonView_ importBookmarksButton] frame];
   if (isModeMaterial) {
-    // Bookmark buttons are shorter and start farther from the bookmark bar's
-    // left edge so adjust the positions of the noItems and importBookmarks
-    // textfields.
+    // Bookmark buttons start farther from the bookmark bar's left edge so
+    // adjust the positions of the noItems and importBookmarks textfields.
     const CGFloat kMaterialBookmarksTextfieldOffsetX = 14;
-    const CGFloat kMaterialBookmarksTextfieldOffsetY = -2;
-    originalNoItemsRect_.origin =
-        NSOffsetRect(originalNoItemsRect_,
-                     kMaterialBookmarksTextfieldOffsetX,
-                     kMaterialBookmarksTextfieldOffsetY).origin;
+    originalNoItemsRect_.origin.x += kMaterialBookmarksTextfieldOffsetX;
     [[buttonView_ noItemTextfield] setFrame:originalNoItemsRect_];
 
-    originalImportBookmarksRect_.origin =
-        NSOffsetRect(originalImportBookmarksRect_,
-                     kMaterialBookmarksTextfieldOffsetX,
-                     kMaterialBookmarksTextfieldOffsetY).origin;
+    originalImportBookmarksRect_.origin.x += kMaterialBookmarksTextfieldOffsetX;
     [[buttonView_ importBookmarksButton] setFrame:originalImportBookmarksRect_];
   }
 
   // To make life happier when the bookmark bar is floating, the chevron is a
   // child of the button view.
   [offTheSideButton_ removeFromSuperview];
   [buttonView_ addSubview:offTheSideButton_];
 
   // When resized we may need to add new buttons, or remove them (if
   // no longer visible), or add/remove the "off the side" menu.
@@ skipping 2560 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