GTK: Dismiss the bookmark folder menu(s) when a context menu item is executed...

chrome/browser/gtk/bookmark_context_menu.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/gtk/bookmark_context_menu.h"
 
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_manager.h"
@@ skipping 197 matching lines @@
 
 // BookmarkContextMenu -------------------------------------------
 
 BookmarkContextMenu::BookmarkContextMenu(
     gfx::NativeView wnd,
     Profile* profile,
     Browser* browser,
     PageNavigator* navigator,
     const BookmarkNode* parent,
     const std::vector<const BookmarkNode*>& selection,
-    ConfigurationType configuration)
+    ConfigurationType configuration,
+    Delegate* delegate)
     : wnd_(wnd),
       profile_(profile),
       browser_(browser),
       navigator_(navigator),
       parent_(parent),
       selection_(selection),
       model_(profile->GetBookmarkModel()),
-      configuration_(configuration) {
+      configuration_(configuration),
+      delegate_(delegate) {
   DCHECK(profile_);
   DCHECK(model_->IsLoaded());
   CreateMenuObject();
 
   if (configuration != BOOKMARK_MANAGER_ORGANIZE_MENU) {
     if (selection.size() == 1 && selection[0]->is_url()) {
       AppendItem(IDS_BOOMARK_BAR_OPEN_ALL, IDS_BOOMARK_BAR_OPEN_IN_NEW_TAB);
       AppendItem(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW,
                  IDS_BOOMARK_BAR_OPEN_IN_NEW_WINDOW);
       AppendItem(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO,
@@ skipping 50 matching lines @@
   }
 
   model_->AddObserver(this);
 }
 
 BookmarkContextMenu::~BookmarkContextMenu() {
   if (model_)
     model_->RemoveObserver(this);
 }
 
+void BookmarkContextMenu::DelegateDestroyed() {
+  delegate_ = NULL;
+}
+
 void BookmarkContextMenu::ExecuteCommand(int id) {
+  if (delegate_)
+    delegate_->WillExecuteCommand();
+
   switch (id) {
     case IDS_BOOMARK_BAR_OPEN_ALL:
     case IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO:
     case IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW: {
       PageNavigator* navigator = browser_ ?
           browser_->GetSelectedTabContents() : navigator_;
       WindowOpenDisposition initial_disposition;
       if (id == IDS_BOOMARK_BAR_OPEN_ALL) {
         initial_disposition = NEW_FOREGROUND_TAB;
         UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_OpenAll",
@@ skipping 241 matching lines @@
     if (NodeHasURLs(selection_[i]))
       return true;
   }
   return false;
 }
 
 const BookmarkNode* BookmarkContextMenu::GetParentForNewNodes() const {
   return (selection_.size() == 1 && selection_[0]->is_folder()) ?
       selection_[0] : parent_;
 }