Let Chrome app handle Ash accelerators first if the app is launched as a window

chrome/browser/ui/views/frame/browser_view.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/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 84 matching lines @@
 #include "ui/views/events/event.h"
 #include "ui/views/focus/external_focus_tracker.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
 #if defined(USE_ASH)
+#include "ash/accelerators/accelerator_controller.h"
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/views/ash/launcher/launcher_updater.h"
 #include "chrome/browser/ui/views/ash/window_positioner.h"
 #elif defined(OS_WIN)
 #include "base/win/metro.h"
 #include "chrome/browser/aeropeek_manager.h"
 #include "chrome/browser/jumplist_win.h"
 #include "ui/views/widget/native_widget_win.h"
 #endif
 
 #if defined(USE_AURA)
 #include "chrome/browser/ui/views/accelerator_table.h"
+#include "ui/aura/event.h"
 #include "ui/gfx/screen.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"
 #endif
 
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
 #include "chrome/browser/ui/views/sync/one_click_signin_bubble_view.h"
 #endif
@@ skipping 51 matching lines @@
       ::GetProcAddress(metro, "SetFrameWindow"));
   set_frame_window(frame->GetNativeWindow());
   return true;
 }
 #else
 bool AdjustFrameForImmersiveMode(BrowserFrame* frame) {
   return false;
 }
 #endif
 
+#if defined(USE_ASH)
+// Do not call this function directly.
+bool ProcessAshAcceleratorInternal(const NativeWebKeyboardEvent& event,

[Ben Goodger (Google), 2012/05/01 16:00:37]

Can we move this back to src/ash?

I don't like having code required for ash hard coded here.

Think of it this way. What if I were to use views::WebView to wrap a
WebContents... and then wanted to have the app I hosted in that setting to be
able to handle these events. I think this belongs at a different layer.

[Yusuke Sato, 2012/05/02 16:40:11]

Thanks for the suggestion. Migrated to Ash-only solution which should support
views::WebView.

On 2012/05/01 16:00:37, Ben Goodger (Google) wrote:

+                                   bool check_only) {
+  ui::Accelerator accelerator(
+      static_cast<ui::KeyboardCode>(event.windowsKeyCode),
+      (event.modifiers & NativeWebKeyboardEvent::ShiftKey) ==
+          NativeWebKeyboardEvent::ShiftKey,
+      (event.modifiers & NativeWebKeyboardEvent::ControlKey) ==
+          NativeWebKeyboardEvent::ControlKey,
+      (event.modifiers & NativeWebKeyboardEvent::AltKey) ==
+          NativeWebKeyboardEvent::AltKey);
+
+  if (event.type == WebKit::WebInputEvent::KeyUp)
+    accelerator.set_type(ui::ET_KEY_RELEASED);
+  else if (event.type != WebKit::WebInputEvent::RawKeyDown)
+    return false;
+
+  const aura::KeyEvent* aura_event =
+      static_cast<const aura::KeyEvent*>(event.os_event);
+  ash::AcceleratorController* accelerator_controller =
+      ash::Shell::GetInstance()->accelerator_controller();
+
+  // |aura_event| could be NULL when the keyboard |event| is a fabricated one.
+  // See RenderWidgetHostViewAura::OnKeyEvent() for details.
+  if (!aura_event || !accelerator_controller)
+    return false;
+
+  if (check_only && accelerator_controller->IsAccelerator(accelerator))
+    return true;
+  if (!check_only && accelerator_controller->Process(accelerator))
+    return true;
+
+  return false;
+}
+
+bool ProcessAshAccelerator(const NativeWebKeyboardEvent& event) {
+  return ProcessAshAcceleratorInternal(event, false);
+}
+
+bool IsAshAccelerator(const NativeWebKeyboardEvent& event) {
+  return ProcessAshAcceleratorInternal(event, true);
+}
+
+#endif
+
 }  // namespace
 
 // Returned from BrowserView::GetClassName.
 const char BrowserView::kViewClassName[] = "browser/ui/views/BrowserView";
 
 ///////////////////////////////////////////////////////////////////////////////
 // BookmarkExtensionBackground, private:
 // This object serves as the views::Background object which is used to layout
 // and paint the bookmark bar.
 class BookmarkExtensionBackground : public views::Background {
@@ skipping 982 matching lines @@
                                       const content::SSLStatus& ssl,
                                       bool show_history) {
 }
 
 void BrowserView::ShowAppMenu() {
   toolbar_->app_menu()->Activate();
 }
 
 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                                          bool* is_keyboard_shortcut) {
+#if defined(USE_ASH)
+  if (!browser_->is_app() && ProcessAshAccelerator(event))
+    return true;
+  if (browser_->is_app() && IsAshAccelerator(event)) {
+    *is_keyboard_shortcut = true;
+    return false;
+  }
+#endif
+
   if (event.type != WebKit::WebInputEvent::RawKeyDown)
     return false;
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   // As Alt+F4 is the close-app keyboard shortcut, it needs processing
   // immediately.
   if (event.windowsKeyCode == ui::VKEY_F4 &&
       event.modifiers == NativeWebKeyboardEvent::AltKey) {
     DefWindowProc(event.os_event.hwnd, event.os_event.message,
                   event.os_event.wParam, event.os_event.lParam);
@@ skipping 42 matching lines @@
     return browser_->ExecuteCommandIfEnabled(id);
   }
 
   DCHECK(is_keyboard_shortcut != NULL);
   *is_keyboard_shortcut = true;
 
   return false;
 }
 
 void BrowserView::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
+#if defined(USE_ASH)
+  if (browser_->is_app() && ProcessAshAccelerator(event))
+    return;
+#endif
   unhandled_keyboard_event_handler_.HandleKeyboardEvent(event,
                                                         GetFocusManager());
 }
 
 // TODO(devint): http://b/issue?id=1117225 Cut, Copy, and Paste are always
 // enabled in the page menu regardless of whether the command will do
 // anything. When someone selects the menu item, we just act as if they hit
 // the keyboard shortcut for the command by sending the associated key press
 // to windows. The real fix to this bug is to disable the commands when they
 // won't do anything. We'll need something like an overall clipboard command
@@ skipping 1207 matching lines @@
     return;
 
   PasswordGenerationBubbleView* bubble =
       new PasswordGenerationBubbleView(bounds,
                                        this,
                                        web_contents->GetRenderViewHost());
   views::BubbleDelegateView::CreateBubble(bubble);
   bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
   bubble->Show();
 }