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 1197 matching lines @@
   DCHECK(focus_manager);
 
   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);
+
+  // If the current target of the |accelerator| is not |this| object, and the
+  // browser is not for an app, the |accelerator| will be processed immediately.
+  const ui::AcceleratorTarget* target =
+      focus_manager->GetCurrentTargetForAccelerator(accelerator);
+  if (!browser_->is_app() && target && target != this) {
+    focus_manager->ProcessAccelerator(accelerator);
+    return true;
+  }
 
   // We first find out the browser command associated to the |event|.
   // Then if the command is a reserved one, and should be processed
   // immediately according to the |event|, the command will be executed
   // immediately. Otherwise we just set |*is_keyboard_shortcut| properly and
   // return false.
 
   // This piece of code is based on the fact that accelerators registered
-  // into the |focus_manager| may only trigger a browser command execution.
+  // into the |focus_manager| may only trigger a browser command execution if
+  // the current target of the |accelerator| is |this| object.
   //
   // Here we need to retrieve the command id (if any) associated to the
   // keyboard event. Instead of looking up the command id in the
   // |accelerator_table_| by ourselves, we block the command execution of
   // the |browser_| object then send the keyboard event to the
   // |focus_manager| as if we are activating an accelerator key.
   // Then we can retrieve the command id from the |browser_| object.
   browser_->SetBlockCommandExecution(true);
-  focus_manager->ProcessAccelerator(accelerator);
+  if (target == this)

[Ben Goodger (Google), 2012/05/04 16:25:33]

not sure if I understand the target checking. was BrowserView previously always
the accelerator target for browser window keyboard shortcuts??

[Yusuke Sato, 2012/05/07 08:27:28]

Done.

On 2012/05/04 16:25:33, Ben Goodger (Google) wrote:
Yes, it was (but I've removed the target checking to make the code simpler.)

+    focus_manager->ProcessAccelerator(accelerator);
   int id = browser_->GetLastBlockedCommand(NULL);
   browser_->SetBlockCommandExecution(false);
 
   if (id == -1)
     return false;
 
   // Executing the command may cause |this| object to be destroyed.
   if (browser_->IsReservedCommandOrKey(id, event)) {
     UpdateAcceleratorMetrics(accelerator, id);
     return browser_->ExecuteCommandIfEnabled(id);
@@ skipping 1224 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();
 }