diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 00:27:54 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 00:27:54 +0000 |
| commit | 5c05552f31b735d42f92d39094725e4544afa0ae (patch) | |
| tree | 7bb9e16d87eb9ecc69f9ded7a7bc0ceae04f9d14 /chrome | |
| parent | f4f771057c8e0b0971b3ea68c8a587b5a6b4a4fe (diff) | |
| download | chromium_src-5c05552f31b735d42f92d39094725e4544afa0ae.zip chromium_src-5c05552f31b735d42f92d39094725e4544afa0ae.tar.gz chromium_src-5c05552f31b735d42f92d39094725e4544afa0ae.tar.bz2 | |
When doing bookmark sync and nodes are deleted, close any open bookmark
bar folders.
BUG=http://crbug.com/40430
TEST=see bug
Review URL: http://codereview.chromium.org/1613006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43899 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_controller.mm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm index c84b087..f0e332a 100644 --- a/chrome/browser/cocoa/bookmark_bar_controller.mm +++ b/chrome/browser/cocoa/bookmark_bar_controller.mm @@ -1612,6 +1612,12 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) { DCHECK(model == bookmarkModel_); if (!model->IsLoaded()) return; + + // If this is a rebuild request while we have a folder open, close it. + if (folderController_) { + [self closeAllBookmarkFolders]; + } + // Brute force nuke and build. savedFrameWidth_ = NSWidth([[self view] frame]); const BookmarkNode* node = model->GetBookmarkBarNode(); |