diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 17:08:47 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 17:08:47 +0000 |
commit | 269e129404527aa945737d25ff51dfc8b46e8d72 (patch) | |
tree | 5f7f69dae393b5bba9f9f914c9543bd7f5ae1e36 /chrome/browser/views/bookmark_bar_view.cc | |
parent | 8c6c5c060f7263dfd9d442845677167976d70e68 (diff) | |
download | chromium_src-269e129404527aa945737d25ff51dfc8b46e8d72.zip chromium_src-269e129404527aa945737d25ff51dfc8b46e8d72.tar.gz chromium_src-269e129404527aa945737d25ff51dfc8b46e8d72.tar.bz2 |
Test case for fix to bug 26279.
BUG=26279
TEST=see bug
Review URL: http://codereview.chromium.org/339092
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_bar_view.cc')
-rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 492f323c..45265b9 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -1214,9 +1214,11 @@ void BookmarkBarView::ShowContextMenu(View* source, parent = model_->GetBookmarkBarNode(); nodes.push_back(parent); } + // Browser may be null during testing. + PageNavigator* navigator = + browser() ? browser()->GetSelectedTabContents() : NULL; BookmarkContextMenu controller(GetWindow()->GetNativeWindow(), GetProfile(), - browser()->GetSelectedTabContents(), - parent, nodes, + navigator, parent, nodes, BookmarkContextMenuController::BOOKMARK_BAR); controller.RunMenuAt(gfx::Point(x, y)); } |