OOP PDF: Forward keyboard events to a constrained web dialog's initiator's delegate.

chrome/browser/ui/views/constrained_web_dialog_delegate_views.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 "chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
@@ skipping 23 matching lines @@
   ~WebDialogWebContentsDelegateViews() override {}
 
   // ui::WebDialogWebContentsDelegate:
   void WebContentsFocused(content::WebContents* contents) override {
     // Ensure the WebView is focused when its WebContents is focused.
     web_view_->RequestFocus();
   }
   void HandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) override {
-    // Forward shortcut keys in dialog to the browser. http://crbug.com/104586
+    // Forward shortcut keys in dialog to our initiator's delegate.
+    // http://crbug.com/104586
     // Disabled on Mac due to http://crbug.com/112173
 #if !defined(OS_MACOSX)
-    Browser* current_browser = chrome::FindBrowserWithWebContents(initiator_);
-    if (!current_browser)
+    auto delegate = initiator_->GetDelegate();
+    if (!delegate)
       return;
-    current_browser->window()->HandleKeyboardEvent(event);
+    delegate->HandleKeyboardEvent(initiator_, event);
 #endif
   }
 
  private:
   content::WebContents* initiator_;
   views::WebView* web_view_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDialogWebContentsDelegateViews);
 };
 
@@ skipping 126 matching lines @@
 ConstrainedWebDialogDelegate* CreateConstrainedWebDialog(
     content::BrowserContext* browser_context,
     ui::WebDialogDelegate* delegate,
     content::WebContents* web_contents) {
   ConstrainedWebDialogDelegateViewViews* dialog =
       new ConstrainedWebDialogDelegateViewViews(
           browser_context, delegate, web_contents);
   constrained_window::ShowWebModalDialogViews(dialog, web_contents);
   return dialog;
 }