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 18 matching lines @@
 using content::WebUIMessageHandler;
 using ui::WebDialogDelegate;
 using ui::WebDialogUI;
 using ui::WebDialogWebContentsDelegate;
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebDialogView, public:
 
-WebDialogView::WebDialogView(
-    content::BrowserContext* context,
-    WebDialogDelegate* delegate,
-    WebContentsHandler* handler)
-    : ClientView(NULL, NULL),
+WebDialogView::WebDialogView(content::BrowserContext* context,
+                             WebDialogDelegate* delegate,
+                             WebContentsHandler* handler)
+    : ClientView(nullptr, nullptr),
       WebDialogWebContentsDelegate(context, handler),
       delegate_(delegate),
-      web_view_(new views::WebView(context)),
-      is_attempting_close_dialog_(false),
-      before_unload_fired_(false),
-      closed_via_webui_(false),
-      close_contents_called_(false) {
+      web_view_(new views::WebView(context)) {
   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));
+
+  if (delegate_) {
+    for (const auto& accelerator : delegate_->GetAccelerators())
+      AddAccelerator(accelerator);
+  }
 }
 
 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) {
+  if (delegate_ && delegate_->AcceleratorPressed(accelerator))
+    return true;
+
   // Pressing ESC closes the dialog.
   DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code());
   if (GetWidget())
     GetWidget()->Close();
   return true;
 }
 
 void WebDialogView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && GetWidget())
@@ skipping 133 matching lines @@
   if (delegate_) {
     // Store the dialog content area size.
     delegate_->StoreDialogSize(GetContentsBounds().size());
   }
 
   if (GetWidget())
     GetWidget()->Close();
 
   if (delegate_) {
     delegate_->OnDialogClosed(json_retval);
-    delegate_ = NULL;  // We will not communicate further with the delegate.
+    delegate_ = nullptr;  // We will not communicate further with the delegate.
   }
 }
 
 void WebDialogView::OnDialogCloseFromWebUI(const std::string& json_retval) {
   closed_via_webui_ = true;
   dialog_close_retval_ = json_retval;
   if (GetWidget())
     GetWidget()->Close();
 }
 
@@ skipping 41 matching lines @@
   close_contents_called_ = true;
   bool close_dialog = false;
   OnCloseContents(source, &close_dialog);
   if (close_dialog)
     OnDialogClosed(closed_via_webui_ ? dialog_close_retval_ : std::string());
 }
 
 content::WebContents* WebDialogView::OpenURLFromTab(
     content::WebContents* source,
     const content::OpenURLParams& params) {
-  content::WebContents* new_contents = NULL;
+  content::WebContents* new_contents = nullptr;
   if (delegate_ &&
       delegate_->HandleOpenURLFromTab(source, params, &new_contents)) {
     return new_contents;
   }
   return WebDialogWebContentsDelegate::OpenURLFromTab(source, params);
 }
 
 void WebDialogView::AddNewContents(content::WebContents* source,
                                    content::WebContents* new_contents,
                                    WindowOpenDisposition disposition,
@@ skipping 50 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