Refactor the keyboard events handling code related to RenderViewHostDelegate:...

chrome/browser/extensions/extension_host.cc

 // Copyright (c) 2006-2009 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 "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 501 matching lines @@
   // renderer).
   view()->RequestFocus();
 #else
   // TODO(port)
 #endif
 }
 
 void ExtensionHost::TakeFocus(bool reverse) {
 }
 
-bool ExtensionHost::IsReservedAccelerator(const NativeWebKeyboardEvent& event) {
+bool ExtensionHost::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
+                                           bool* is_keyboard_shortcut) {
+  if (extension_host_type_ == ViewType::EXTENSION_POPUP &&
+      event.windowsKeyCode == base::VKEY_ESCAPE) {
+    DCHECK(is_keyboard_shortcut != NULL);
+    *is_keyboard_shortcut = true;
+  }
   return false;
 }
 
-bool ExtensionHost::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
+void ExtensionHost::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
   if (extension_host_type_ == ViewType::EXTENSION_POPUP &&
       event.windowsKeyCode == base::VKEY_ESCAPE) {
     NotificationService::current()->Notify(
         NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE,
         Source<Profile>(profile_),
         Details<ExtensionHost>(this));
-    return true;
   }
-  return false;
 }
 
 void ExtensionHost::HandleMouseEvent() {
 #if defined(OS_WIN)
   if (view_.get())
     view_->HandleMouseEvent();
 #endif
 }
 
 void ExtensionHost::HandleMouseLeave() {
@@ skipping 68 matching lines @@
     // Extensions hosted in ExternalTabContainer objects may not have
     // an associated browser.
     Browser* browser = GetBrowser();
     if (browser)
       window_id = ExtensionTabUtil::GetWindowId(browser);
   } else if (extension_host_type_ != ViewType::EXTENSION_BACKGROUND_PAGE) {
     NOTREACHED();
   }
   return window_id;
 }