diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-27 17:46:06 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-27 17:46:06 +0000 |
| commit | 9bbde62b72f050510345469142d742dd09407383 (patch) | |
| tree | ec1ecb58ceee0eda10d1c92a910c5f48aa418dd4 /views | |
| parent | ebf50a100c747724f5a776c6780907b5efc68e5f (diff) | |
| download | chromium_src-9bbde62b72f050510345469142d742dd09407383.zip chromium_src-9bbde62b72f050510345469142d742dd09407383.tar.gz chromium_src-9bbde62b72f050510345469142d742dd09407383.tar.bz2 | |
Landing tyoshino patch.
See http://codereview.chromium.org/115768
TBR=tyoshino
Review URL: http://codereview.chromium.org/115822
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/message_box_view.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc index 1d00158..785ea42 100644 --- a/views/controls/message_box_view.cc +++ b/views/controls/message_box_view.cc @@ -94,6 +94,10 @@ bool MessageBoxView::AcceleratorPressed( // We only accepts Ctrl-C. DCHECK(accelerator.GetKeyCode() == 'C' && accelerator.IsCtrlDown()); + // We must not intercept Ctrl-C when we have a text box and it's focused. + if (prompt_field_ && prompt_field_->HasFocus()) + return false; + if (!views::ViewsDelegate::views_delegate) return false; |