Merge 32335...

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"
+#include "base/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/browsing_instance.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/dom_ui/dom_ui_factory.h"
 #include "chrome/browser/extensions/extension_message_service.h"
@@ skipping 509 matching lines @@
 }
 
 void ExtensionHost::StartDragging(const WebDropData& drop_data,
     WebDragOperationsMask operation_mask) {
 }
 
 void ExtensionHost::UpdateDragCursor(WebDragOperation operation) {
 }
 
 void ExtensionHost::GotFocus() {
+#if defined(TOOLKIT_VIEWS)
+  // Request focus so that the FocusManager has a focused view and can perform
+  // normally its key event processing (so that it lets tab key events go to the
+  // renderer).
+  view()->RequestFocus();
+#else
+  // TODO(port)
+#endif
 }
 
 void ExtensionHost::TakeFocus(bool reverse) {
 }
 
 bool ExtensionHost::IsReservedAccelerator(const NativeWebKeyboardEvent& event) {
   return false;
 }
 
 bool 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
 }
 
@@ skipping 65 matching lines @@
     window_id = ExtensionTabUtil::GetWindowId(
         const_cast<ExtensionHost* >(this)->GetBrowser());
   } else if (extension_host_type_ == ViewType::EXTENSION_BACKGROUND_PAGE) {
     // Background page is not attached to any browser window, so pass -1.
     window_id = -1;
   } else {
     NOTREACHED();
   }
   return window_id;
 }