Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(389)

Unified Diff: views/view.cc

Issue 8341050: Aura: Support non-global keyboard shortcuts. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: '' Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: views/view.cc
diff --git a/views/view.cc b/views/view.cc
index 2d4a60d712628d5c27e70db66090a72f1b17d1a5..773f1cb76056eafd432f6bbefa2b02127c9cd4d4 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -41,6 +41,10 @@
#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 i
mazda 2011/10/27 13:05:05 Done.
+#include "ui/aura/window.h"
+#endif
namespace {
@@ -1226,6 +1230,11 @@ void View::OnFocus() {
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 NativeWidgetAu
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.

Powered by Google App Engine
This is Rietveld 408576698