Aura: Support non-global keyboard shortcuts.

views/view.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/view.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 23 matching lines @@
 #include "views/widget/tooltip_manager.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_gdi_object.h"
 #include "views/accessibility/native_view_accessibility_win.h"
 #endif
 #if defined(TOOLKIT_USES_GTK)
 #include "ui/base/gtk/scoped_handle_gtk.h"
 #endif
+#if defined(USE_AURA)
+#include "ui/aura/focus_manager.h"

[Ben Goodger (Google), 2011/10/26 19:06:04]

you won't need these items after you do the item in my note below:

[mazda, 2011/10/27 13:05:05]

Done.

+#include "ui/aura/window.h"
+#endif
 
 namespace {
 
 // Whether to use accelerated compositing when necessary (e.g. when a view has a
 // transformation).
 #if defined(VIEWS_COMPOSITOR)
 bool use_acceleration_when_possible = true;
 #else
 bool use_acceleration_when_possible = false;
 #endif
@@ skipping 1165 matching lines @@
 
 void View::OnFocus() {
   // TODO(beng): Investigate whether it's possible for us to move this to
   //             Focus().
   // By default, we clear the native focus. This ensures that no visible native
   // view as the focus and that we still receive keyboard inputs.
   FocusManager* focus_manager = GetFocusManager();
   if (focus_manager)
     focus_manager->ClearNativeFocus();
 
+#if defined(USE_AURA)
+  aura::Window* window = GetWidget()->GetNativeWindow();

[Ben Goodger (Google), 2011/10/26 19:06:04]

This should be done by implementing NativeWidgetAura::ClearNativeFocus().

[mazda, 2011/10/27 13:05:05]

Done.

+  window->GetFocusManager()->SetFocusedWindow(window);
+#endif
+
   // TODO(beng): Investigate whether it's possible for us to move this to
   //             Focus().
   // Notify assistive technologies of the focus change.
   GetWidget()->NotifyAccessibilityEvent(
       this, ui::AccessibilityTypes::EVENT_FOCUS, true);
 }
 
 void View::OnBlur() {
 }
 
@@ skipping 836 matching lines @@
 
   OSExchangeData data;
   WriteDragData(press_pt, &data);
 
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
   GetWidget()->RunShellDrag(this, data, drag_operations);
 }
 
 }  // namespace views