Adds the ability for WebContentsDelegate to decide if event should be updated

chrome/browser/extensions/extension_view_host.cc

 // Copyright 2013 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_view_host.h"
 
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_view.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/autofill/chrome_autofill_client.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "components/autofill/content/browser/content_autofill_driver_factory.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
+#include "content/public/browser/keyboard_event_processing_result.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/runtime_data.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
@@ skipping 135 matching lines @@
 }
 
 bool ExtensionViewHost::ShouldTransferNavigation(
     bool is_main_frame_navigation) {
   // Block navigations that cause main frame of an extension pop-up (or
   // background page) to navigate to non-extension content (i.e. to web
   // content).
   return !is_main_frame_navigation;
 }
 
-bool ExtensionViewHost::PreHandleKeyboardEvent(
-    WebContents* source,
-    const NativeWebKeyboardEvent& event,
-    bool* is_keyboard_shortcut) {
+content::KeyboardEventProcessingResult
+ExtensionViewHost::PreHandleKeyboardEvent(WebContents* source,
+                                          const NativeWebKeyboardEvent& event) {
   if (extension_host_type() == VIEW_TYPE_EXTENSION_POPUP &&
       event.type() == NativeWebKeyboardEvent::RawKeyDown &&
       event.windowsKeyCode == ui::VKEY_ESCAPE) {
-    DCHECK(is_keyboard_shortcut != NULL);
-    *is_keyboard_shortcut = true;
-    return false;
+    return content::KeyboardEventProcessingResult::NOT_HANDLED_IS_SHORTCUT;
   }
 
   // Handle higher priority browser shortcuts such as Ctrl-w.
   Browser* browser = view_->GetBrowser();
   if (browser)
-    return browser->PreHandleKeyboardEvent(source, event, is_keyboard_shortcut);
+    return browser->PreHandleKeyboardEvent(source, event);
 
-  *is_keyboard_shortcut = false;
-  return false;
+  return content::KeyboardEventProcessingResult::NOT_HANDLED;
 }
 
 void ExtensionViewHost::HandleKeyboardEvent(
     WebContents* source,
     const NativeWebKeyboardEvent& event) {
   if (extension_host_type() == VIEW_TYPE_EXTENSION_POPUP) {
     if (event.type() == NativeWebKeyboardEvent::RawKeyDown &&
         event.windowsKeyCode == ui::VKEY_ESCAPE) {
       Close();
       return;
@@ skipping 101 matching lines @@
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   DCHECK_EQ(type, extensions::NOTIFICATION_EXTENSION_BACKGROUND_PAGE_READY);
   DCHECK(ExtensionSystem::Get(browser_context())
              ->runtime_data()
              ->IsBackgroundPageReady(extension()));
   LoadInitialURL();
 }
 
 }  // namespace extensions