Makes bookmark bar view reset PageNavigator on menu when PageNavigator

chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

 // Copyright (c) 2011 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/ui/views/bookmarks/bookmark_bar_view.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <vector>
@@ skipping 376 matching lines @@
 
   size_animation_->Reset(1);
 }
 
 BookmarkBarView::~BookmarkBarView() {
   if (model_)
     model_->RemoveObserver(this);
 
   // It's possible for the menu to outlive us, reset the observer to make sure
   // it doesn't have a reference to us.
-  if (bookmark_menu_)
+  if (bookmark_menu_) {
     bookmark_menu_->set_observer(NULL);
+    bookmark_menu_->SetPageNavigator(NULL);
+  }
+  if (context_menu_.get())
+    context_menu_->SetPageNavigator(NULL);
 
   StopShowFolderDropMenuTimer();
 
   if (sync_service_)
     sync_service_->RemoveObserver(this);
 }
 
 void BookmarkBarView::SetPageNavigator(PageNavigator* navigator) {
   page_navigator_ = navigator;
+  if (bookmark_menu_)
+    bookmark_menu_->SetPageNavigator(navigator);
+  if (context_menu_.get())
+    context_menu_->SetPageNavigator(navigator);
 }
 
 void BookmarkBarView::SetBookmarkBarState(
     BookmarkBar::State state,
     BookmarkBar::AnimateChangeType animate_type) {
   if (animate_type == BookmarkBar::ANIMATE_STATE_CHANGE) {
     animating_detached_ = (state == BookmarkBar::DETACHED ||
                            bookmark_bar_state_ == BookmarkBar::DETACHED);
     if (state == BookmarkBar::SHOW)
       size_animation_->Show();
@@ skipping 672 matching lines @@
     nodes.push_back(node);
     parent = node->parent();
   } else {
     parent = model_->bookmark_bar_node();
     nodes.push_back(parent);
   }
   Profile* profile = browser_->profile();
   bool close_on_remove =
       (parent == profile->GetBookmarkModel()->other_node()) &&
       (parent->child_count() == 1);
-  BookmarkContextMenu controller(GetWidget(), profile,
-      browser_->GetSelectedTabContents(), parent, nodes, close_on_remove);
-  controller.RunMenuAt(p);
+  context_menu_.reset(new BookmarkContextMenu(GetWidget(), profile,
+      browser_->GetSelectedTabContents(), parent, nodes, close_on_remove));
+  context_menu_->RunMenuAt(p);
 }
 
 void BookmarkBarView::Observe(int type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
   DCHECK(browser_->profile());
   switch (type) {
     case chrome::NOTIFICATION_BOOKMARK_BUBBLE_SHOWN: {
       StopThrobbing(true);
       GURL url = *(Details<GURL>(details).ptr());
@@ skipping 611 matching lines @@
               (1 - size_animation_->GetCurrentValue())));
     } else {
       prefsize.set_height(
           static_cast<int>(
               browser_defaults::kBookmarkBarHeight *
               size_animation_->GetCurrentValue()));
     }
   }
   return prefsize;
 }