Aura: Support non-global keyboard shortcuts.

views/widget/native_widget_aura.cc

 // Copyright (c) 2011 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 "views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/event.h"
 #include "ui/aura/window.h"
@@ skipping 401 matching lines @@
   if (window_)
     window_->SchedulePaintInRect(rect);
 }
 
 void NativeWidgetAura::SetCursor(gfx::NativeCursor cursor) {
   cursor_ = cursor;
   aura::Desktop::GetInstance()->SetCursor(cursor);
 }
 
 void NativeWidgetAura::ClearNativeFocus() {
-  NOTIMPLEMENTED();
+  if (window_ && window_->GetFocusManager())
+    window_->GetFocusManager()->SetFocusedWindow(window_);
 }
 
 void NativeWidgetAura::FocusNativeView(gfx::NativeView native_view) {
   NOTIMPLEMENTED();
 }
 
 bool NativeWidgetAura::ConvertPointFromAncestor(const Widget* ancestor,
                                                 gfx::Point* point) const {
   NOTIMPLEMENTED();
   return false;
 }
 
 gfx::Rect NativeWidgetAura::GetWorkAreaBoundsInScreen() const {
   return gfx::Screen::GetMonitorWorkAreaNearestWindow(GetNativeView());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, views::InputMethodDelegate implementation:
 
 void NativeWidgetAura::DispatchKeyEventPostIME(const KeyEvent& key) {
-  delegate_->OnKeyEvent(key);
+  if (delegate_->OnKeyEvent(key))
+    return;
+  if (key.type() == ui::ET_KEY_PRESSED && GetWidget()->GetFocusManager())
+    GetWidget()->GetFocusManager()->OnKeyEvent(key);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, aura::WindowDelegate implementation:
 
 void NativeWidgetAura::OnBoundsChanged(const gfx::Rect& old_bounds,
                                        const gfx::Rect& new_bounds) {
   if (old_bounds.size() != new_bounds.size())
     delegate_->OnNativeWidgetSizeChanged(new_bounds.size());
 }
 
 void NativeWidgetAura::OnFocus() {
   Widget* widget = GetWidget();
   if (widget->is_top_level()) {
     InputMethod* input_method = widget->GetInputMethod();
     input_method->OnFocus();
     // See description of got_initial_focus_in_ for details on this.
-    widget->GetFocusManager()->RestoreFocusedView();
+    // TODO(mazda): Investigate this is actually necessary.
+    // widget->GetFocusManager()->RestoreFocusedView();
   }
   delegate_->OnNativeFocus(window_);
 }
 
 void NativeWidgetAura::OnBlur() {
   Widget* widget = GetWidget();
   if (widget->is_top_level()) {
     InputMethod* input_method = widget->GetInputMethod();
     input_method->OnBlur();
     widget->GetFocusManager()->StoreFocusedView();
@@ skipping 165 matching lines @@
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   NOTIMPLEMENTED();
   return false;
 }
 
 }  // namespace internal
 }  // namespace views