diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | chrome/browser/views/html_dialog_view.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/views/html_dialog_view.h | 1 |
3 files changed, 14 insertions, 0 deletions
@@ -49,3 +49,5 @@ Pierre-Antoine LaFayette <pierre.lafayette@gmail.com> Song YeWen <ffmpeg@gmail.com> Philippe Beauchamp <philippe.beauchamp@gmail.com> Vedran Šajatović <vedran.sajatovic@gmail.com> +Randy Posynick <randy.posynick@gmail.com> +Bruno Calvignac <brunocalvignac@gmail.com> diff --git a/chrome/browser/views/html_dialog_view.cc b/chrome/browser/views/html_dialog_view.cc index ea8476a..cda5340 100644 --- a/chrome/browser/views/html_dialog_view.cc +++ b/chrome/browser/views/html_dialog_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/html_dialog_view.h" +#include "base/keyboard_codes.h" #include "chrome/browser/browser.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "views/widget/root_view.h" @@ -48,6 +49,13 @@ gfx::Size HtmlDialogView::GetPreferredSize() { return out; } +bool HtmlDialogView::AcceleratorPressed(const views::Accelerator& accelerator) { + // Pressing ESC closes the dialog. + DCHECK_EQ(base::VKEY_ESCAPE, accelerator.GetKeyCode()); + OnDialogClosed(std::string()); + return true; +} + //////////////////////////////////////////////////////////////////////////////// // HtmlDialogView, views::WindowDelegate implementation: @@ -216,5 +224,8 @@ void HtmlDialogView::InitDialog() { HtmlDialogUI::GetPropertyAccessor().SetProperty(tab_contents_->property_bag(), this); + // Pressing the ESC key will close the dialog. + AddAccelerator(views::Accelerator(base::VKEY_ESCAPE, false, false, false)); + DOMView::LoadURL(delegate_->GetDialogContentURL()); } diff --git a/chrome/browser/views/html_dialog_view.h b/chrome/browser/views/html_dialog_view.h index ff49143..ee9e250 100644 --- a/chrome/browser/views/html_dialog_view.h +++ b/chrome/browser/views/html_dialog_view.h @@ -41,6 +41,7 @@ class HtmlDialogView // Overridden from views::View: virtual gfx::Size GetPreferredSize(); + virtual bool AcceleratorPressed(const views::Accelerator& accelerator); // Overridden from views::WindowDelegate: virtual bool CanResize() const; |