Add WebContents* to some more WebContentsDelegate methods

chrome/browser/extensions/extension_host.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/extensions/extension_host.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/memory/singleton.h"
@@ skipping 435 matching lines @@
       // Only allow these from hosts that are bound to a browser (e.g. popups).
       // Otherwise they are not driven by a user gesture.
       Browser* browser = view() ? view()->browser() : NULL;
       return browser ? browser->OpenURL(params) : NULL;
     }
     default:
       return NULL;
   }
 }
 
-bool ExtensionHost::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
+bool ExtensionHost::PreHandleKeyboardEvent(WebContents* source,
+                                           const NativeWebKeyboardEvent& event,
                                            bool* is_keyboard_shortcut) {
   if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_POPUP &&
       event.type == NativeWebKeyboardEvent::RawKeyDown &&
       event.windowsKeyCode == ui::VKEY_ESCAPE) {
     DCHECK(is_keyboard_shortcut != NULL);
     *is_keyboard_shortcut = true;
     return false;
   }
 
   // Handle higher priority browser shortcuts such as Ctrl-w.
   Browser* browser = view() ? view()->browser() : NULL;
   if (browser)
-    return browser->PreHandleKeyboardEvent(event, is_keyboard_shortcut);
+    return browser->PreHandleKeyboardEvent(source, event, is_keyboard_shortcut);
 
   *is_keyboard_shortcut = false;
   return false;
 }
 
-void ExtensionHost::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
+void ExtensionHost::HandleKeyboardEvent(WebContents* source,
+                                        const NativeWebKeyboardEvent& event) {
   if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_POPUP) {
     if (event.type == NativeWebKeyboardEvent::RawKeyDown &&
         event.windowsKeyCode == ui::VKEY_ESCAPE) {
       Close();
       return;
     }
   }
-  UnhandledKeyboardEvent(event);
+  UnhandledKeyboardEvent(source, event);
 }
 
 bool ExtensionHost::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ExtensionHost, message)
     IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest)
     IPC_MESSAGE_HANDLER(ExtensionHostMsg_EventAck, OnEventAck)
     IPC_MESSAGE_HANDLER(ExtensionHostMsg_IncrementLazyKeepaliveCount,
                         OnIncrementLazyKeepaliveCount)
     IPC_MESSAGE_HANDLER(ExtensionHostMsg_DecrementLazyKeepaliveCount,
@@ skipping 22 matching lines @@
 }
 
 void ExtensionHost::OnDecrementLazyKeepaliveCount() {
   ExtensionProcessManager* pm =
       ExtensionSystem::Get(profile_)->process_manager();
   if (pm)
     pm->DecrementLazyKeepaliveCount(extension());
 }
 
 void ExtensionHost::UnhandledKeyboardEvent(
+    WebContents* source,
     const content::NativeWebKeyboardEvent& event) {
   // Handle lower priority browser shortcuts such as Ctrl-f.
   Browser* browser = view() ? view()->browser() : NULL;
   if (browser)
-    return browser->HandleKeyboardEvent(event);
+    return browser->HandleKeyboardEvent(source, event);
 }
 
 void ExtensionHost::RenderViewCreated(RenderViewHost* render_view_host) {
   render_view_host_ = render_view_host;
 
   if (view())
     view()->RenderViewCreated();
 
   // If the host is bound to a window, then extract its id. Extensions hosted
   // in ExternalTabContainer objects may not have an associated window.
@@ skipping 53 matching lines @@
 }
 
 void ExtensionHost::RenderViewReady() {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_HOST_CREATED,
       content::Source<Profile>(profile_),
       content::Details<ExtensionHost>(this));
 }
 
 }  // namespace extensions