cros: Bind hangup red button on remote controller to close web dialog

ui/views/controls/webview/web_dialog_view.cc

 // Copyright (c) 2012 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 "ui/views/controls/webview/web_dialog_view.h"
 
 #include <vector>
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
@@ skipping 36 matching lines @@
       is_attempting_close_dialog_(false),
       before_unload_fired_(false),
       closed_via_webui_(false),
       close_contents_called_(false) {
   web_view_->set_allow_accelerators(true);
   AddChildView(web_view_);
   set_contents_view(web_view_);
   SetLayoutManager(new views::FillLayout);
   // Pressing the ESC key will close the dialog.
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
+
+  // For Chrome OS/CFM, Shift + Browser Back is mapped to hangup button, which
+  // can be used to close the web dialog.
+  ui::Accelerator shift_browser_back(ui::VKEY_BROWSER_BACK, ui::EF_SHIFT_DOWN);
+  if (AdditionalAccelerator(shift_browser_back))
+    AddAccelerator(shift_browser_back);
 }
 
 WebDialogView::~WebDialogView() {
 }
 
 content::WebContents* WebDialogView::web_contents() {
   return web_view_->web_contents();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebDialogView, views::View implementation:
 
 gfx::Size WebDialogView::GetPreferredSize() const {
   gfx::Size out;
   if (delegate_)
     delegate_->GetDialogSize(&out);
   return out;
 }
 
 gfx::Size WebDialogView::GetMinimumSize() const {
   gfx::Size out;
   if (delegate_)
     delegate_->GetMinimumDialogSize(&out);
   return out;
 }
 
 bool WebDialogView::AcceleratorPressed(const ui::Accelerator& accelerator) {
-  // Pressing ESC closes the dialog.
-  DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code());
+  DCHECK(ui::VKEY_ESCAPE == accelerator.key_code() ||
+         AdditionalAccelerator(accelerator));
   if (GetWidget())
     GetWidget()->Close();
   return true;
 }
 
 void WebDialogView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && GetWidget())
     InitDialog();
 }
@@ skipping 162 matching lines @@
   return true;
 }
 
 bool WebDialogView::HandleContextMenu(
     const content::ContextMenuParams& params) {
   if (delegate_)
     return delegate_->HandleContextMenu(params);
   return WebDialogWebContentsDelegate::HandleContextMenu(params);
 }
 
+bool WebDialogView::AdditionalAccelerator(
+    const ui::Accelerator& accelerator) const {
+  if (delegate_)
+    return delegate_->AdditionalAccelerator(accelerator);
+  return false;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // content::WebContentsDelegate implementation:
 
 void WebDialogView::MoveContents(WebContents* source, const gfx::Rect& pos) {
   // The contained web page wishes to resize itself. We let it do this because
   // if it's a dialog we know about, we trust it not to be mean to the user.
   GetWidget()->SetBounds(pos);
 }
 
 // A simplified version of BrowserView::HandleKeyboardEvent().
@@ skipping 82 matching lines @@
   web_contents->SetDelegate(this);
 
   // Set the delegate. This must be done before loading the page. See
   // the comment above WebDialogUI in its header file for why.
   WebDialogUI::SetDelegate(web_contents, this);
 
   web_view_->LoadInitialURL(GetDialogContentURL());
 }
 
 }  // namespace views