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

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

BUG=230968
TEST=Lauch Chrome on Mac with instant extended. Ensure you have no bookmark. On the NTP observe that the "Apps" button does not overlap the empty bookmark bar message.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=194516

[beaudoin, 2013-04-15 18:36:12]

Alexei: For Owners + review.

[Alexei Svitkine (slow), 2013-04-15 21:05:29]

Is it possible to have a test for this?

https://codereview.chromium.org/14262013/diff/1/chrome/browser/ui/cocoa/bookm...
File chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm (right):

https://codereview.chromium.org/14262013/diff/1/chrome/browser/ui/cocoa/bookm...
chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm:1397: NSRect
noItemsRect(originalNoItemsRect_);
Nit: use = instead.

https://codereview.chromium.org/14262013/diff/1/chrome/browser/ui/cocoa/bookm...
chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm:1398: NSRect
importBookmarksRect(originalImportBookmarksRect_);
Nit: use = instead.

https://codereview.chromium.org/14262013/diff/1/chrome/browser/ui/cocoa/bookm...
chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm:1400:
noItemsRect.origin.x += NSWidth([appsPageShortcutButton_ frame]);
Use a local variable for width.

[beaudoin, 2013-04-16 15:00:21]

Added tests.

https://codereview.chromium.org/14262013/diff/1/chrome/browser/ui/cocoa/bookm...
File chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm (right):

https://codereview.chromium.org/14262013/diff/1/chrome/browser/ui/cocoa/bookm...
chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm:1397: NSRect
noItemsRect(originalNoItemsRect_);
On 2013/04/15 21:05:29, Alexei Svitkine wrote:
> Nit: use = instead.

Done.

https://codereview.chromium.org/14262013/diff/1/chrome/browser/ui/cocoa/bookm...
chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm:1398: NSRect
importBookmarksRect(originalImportBookmarksRect_);
On 2013/04/15 21:05:29, Alexei Svitkine wrote:
> Nit: use = instead.

Done.

https://codereview.chromium.org/14262013/diff/1/chrome/browser/ui/cocoa/bookm...
chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm:1400:
noItemsRect.origin.x += NSWidth([appsPageShortcutButton_ frame]);
On 2013/04/15 21:05:29, Alexei Svitkine wrote:
> Use a local variable for width.

Done.

[Alexei Svitkine (slow), 2013-04-16 16:29:13]

Thanks, LGTM.

https://codereview.chromium.org/14262013/diff/6001/chrome/browser/ui/cocoa/bo...
File chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
(right):

https://codereview.chromium.org/14262013/diff/6001/chrome/browser/ui/cocoa/bo...
chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm:1553:
virtual void AddCommandLineSwitches() {
Nit: OVERRIDE

[beaudoin, 2013-04-16 20:49:56]

https://codereview.chromium.org/14262013/diff/6001/chrome/browser/ui/cocoa/bo...
File chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
(right):

https://codereview.chromium.org/14262013/diff/6001/chrome/browser/ui/cocoa/bo...
chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm:1553:
virtual void AddCommandLineSwitches() {
On 2013/04/16 16:29:13, Alexei Svitkine wrote:
> Nit: OVERRIDE

Done.

[beaudoin, 2013-04-17 02:03:00]

Committed patchset #3 manually as r194516 (presubmit successful).