summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorscottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-28 00:03:12 +0000
committerscottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-28 00:03:12 +0000
commitaa04dfb4a9760bad611ffb251c991437c120183a (patch)
treeb77c344bb1ecb0cc05bcc97cb257c74529dc3c79 /chrome
parent7b1a3da22c0249e0dcca6eb51a0a5482c333c4ba (diff)
downloadchromium_src-aa04dfb4a9760bad611ffb251c991437c120183a.zip
chromium_src-aa04dfb4a9760bad611ffb251c991437c120183a.tar.gz
chromium_src-aa04dfb4a9760bad611ffb251c991437c120183a.tar.bz2
Prevent context menu crash.
BUG=80288 TEST=Bring up cloud print signing dialog, right click. No crash. Review URL: http://codereview.chromium.org/6883203 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc5
-rw-r--r--chrome/browser/printing/cloud_print/cloud_print_setup_flow.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
index ba5d2de..20763b5 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc
@@ -200,6 +200,11 @@ bool CloudPrintSetupFlow::ShouldShowDialogTitle() const {
return true;
}
+bool CloudPrintSetupFlow::HandleContextMenu(
+ const ContextMenuParams& params) {
+ return true;
+}
+
///////////////////////////////////////////////////////////////////////////////
// GaiaAuthConsumer implementation.
void CloudPrintSetupFlow::OnClientLoginSuccess(
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h
index 7ecc50b..b955eec 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h
@@ -75,6 +75,7 @@ class CloudPrintSetupFlow : public HtmlDialogUIDelegate,
virtual std::wstring GetDialogTitle() const;
virtual bool IsDialogModal() const;
virtual bool ShouldShowDialogTitle() const;
+ virtual bool HandleContextMenu(const ContextMenuParams& params);
// GaiaAuthConsumer implementation.
virtual void OnClientLoginSuccess(