diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-20 23:07:41 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-20 23:07:41 +0000 |
| commit | d911257ba5960881f9f9135f69daf757495b7dbe (patch) | |
| tree | 20a72f4bd09680dbf08cd7f09227e8a26e0683fc | |
| parent | 1b6f0341ff376829e53c4c995e39f8b7e9364316 (diff) | |
| download | chromium_src-d911257ba5960881f9f9135f69daf757495b7dbe.zip chromium_src-d911257ba5960881f9f9135f69daf757495b7dbe.tar.gz chromium_src-d911257ba5960881f9f9135f69daf757495b7dbe.tar.bz2 | |
[Mac] Fix another instance of "Import bookmarks now..." overlap with "Other Bookmarks"
Call [self reconfigureBookmarkBar] from |nodeRemoved:| instead of from
|removeButton:|.
When it was called from |removeButton:|, the |noItemContainer| was still
hidden, so |adjustNoItemContainerWidthsForMaxX:| did nothing. Calling it
from |nodeRemoved:| fixes this.
Also, it is no longer necessary to call
|configureOffTheSideButtonContentsAndVisibility:| from |nodeRemoved:|,
since that is done by |reconfigureBookmarkBar| already.
BUG=44711
TEST=Add a bunch of items to the bookmarks bar. Resize the window to be
narrow. Open the bookmark manager and shift-select all items in the
bookmark bar. Delete the items through the context menu. The bookmark bar
should now contain the "Import bookmarks now..." text that does not overlap
with "Other bookmarks"
Review URL: http://codereview.chromium.org/6879010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82396 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index c8156d0..74408ac 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -2113,7 +2113,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) { [self showOrHideNoItemContainerForNode:model->GetBookmarkBarNode()]; // If we deleted the only item on the "off the side" menu we no // longer need to show it. - [self configureOffTheSideButtonContentsAndVisibility]; + [self reconfigureBookmarkBar]; } // TODO(jrg): linear searching is bad. @@ -2661,7 +2661,6 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) { [buttons_ removeObjectAtIndex:buttonIndex]; --displayedButtonCount_; [self resetAllButtonPositionsWithAnimation:YES]; - [self reconfigureBookmarkBar]; } else if (folderController_ && [folderController_ parentButton] == offTheSideButton_) { // The button being removed is in the OTS (off-the-side) and the OTS |