diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-16 22:28:44 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-16 22:28:44 +0000 |
| commit | ec12ffe60e6d1e26833fb5c518fd6c85ab0c12bb (patch) | |
| tree | c5f53581aa406dc819f4a758abc1e794099fa29b /chrome/browser/cocoa/bookmark_bar_controller.mm | |
| parent | 54fe13676dcdfa8a711b0ffd9a9d96a194da834d (diff) | |
| download | chromium_src-ec12ffe60e6d1e26833fb5c518fd6c85ab0c12bb.zip chromium_src-ec12ffe60e6d1e26833fb5c518fd6c85ab0c12bb.tar.gz chromium_src-ec12ffe60e6d1e26833fb5c518fd6c85ab0c12bb.tar.bz2 | |
Makes canceling 'bookmark all tabs' delete the folder. Or rather,
makes it so that bookmark all tabs only creates the folder if the user
presses ok. I wasn't happy adding another random arg to
BookmarkEditor::Show, so I added in a structure an enum. This makes it
clearer what Show should do.
I also fixed the following:
. On gtk we wouldn't always pick the right parent for nodes.
. The context menu item is now enabled on views/gtk.
And this now breaks the mac side. I'll straighten that out right after
landing this.
BUG=24367
TEST=Make sure 'bookmark all tabs' works, as well as the bookmark
editor work. (get to the bookmark editor by creating a new bookmark,
then clicking edit, or right clicking a bookmark on the bookmark bar and
choosing edit).
Review URL: http://codereview.chromium.org/271115
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/bookmark_bar_controller.mm')
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_controller.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm index 1ff34b0..52ec734 100644 --- a/chrome/browser/cocoa/bookmark_bar_controller.mm +++ b/chrome/browser/cocoa/bookmark_bar_controller.mm @@ -435,7 +435,7 @@ BookmarkEditor::Show([[self view] window], browser_->profile(), node->GetParent(), - node, + BookmarkEditor::EditDetails(node), BookmarkEditor::SHOW_TREE, nil); } @@ -486,7 +486,7 @@ BookmarkEditor::Show([[self view] window], browser_->profile(), parent, - nil, + BookmarkEditor::EditDetails(), BookmarkEditor::SHOW_TREE, nil); } |