Added an event handler to the GAIA login page which closes the dialog when it...

chrome/browser/views/html_dialog_view.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 namespace browser {
 
 // Declared in browser_dialogs.h so that others don't need to depend on our .h.
 void ShowHtmlDialogView(gfx::NativeWindow parent, Browser* browser,
@@ skipping 24 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogView, views::View implementation:
 
 gfx::Size HtmlDialogView::GetPreferredSize() {
   gfx::Size out;
   if (delegate_)
     delegate_->GetDialogSize(&out);
   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:
 
 bool HtmlDialogView::CanResize() const {
   return true;
 }
 
 bool HtmlDialogView::IsModal() const {
   if (delegate_)
     return delegate_->IsDialogModal();
@@ skipping 148 matching lines @@
   // Now Init the DOMView. This view runs in its own process to render the html.
   DOMView::Init(profile_, NULL);
 
   tab_contents_->set_delegate(this);
 
   // Set the delegate. This must be done before loading the page. See
   // the comment above HtmlDialogUI in its header file for why.
   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());
 }