summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-14 19:48:05 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-14 19:48:05 +0000
commit38d7659fd426560410ab1b15a1f8624ae8c93029 (patch)
tree8842c21932b60e02a17bc78be94b8836e7796eff
parente31cc21853fda84cd59c175ed7a98b14034821a1 (diff)
downloadchromium_src-38d7659fd426560410ab1b15a1f8624ae8c93029.zip
chromium_src-38d7659fd426560410ab1b15a1f8624ae8c93029.tar.gz
chromium_src-38d7659fd426560410ab1b15a1f8624ae8c93029.tar.bz2
Add a missing check in TabContentsViewViews::ShowContextMenu().
BUG=100308 TEST=none Review URL: http://codereview.chromium.org/8274028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105546 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
index 81fa66e..454a970 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
@@ -339,8 +339,10 @@ void TabContentsViewViews::ShowCreatedFullscreenWidget(int route_id) {
void TabContentsViewViews::ShowContextMenu(const ContextMenuParams& params) {
// Allow delegates to handle the context menu operation first.
- if (tab_contents_->delegate()->HandleContextMenu(params))
+ if (tab_contents_->delegate() &&
+ tab_contents_->delegate()->HandleContextMenu(params)) {
return;
+ }
context_menu_.reset(new RenderViewContextMenuViews(tab_contents_, params));
context_menu_->Init();