From 41423098805b3f511e683123f2ff53c5fded1396 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Thu, 25 Aug 2011 15:39:58 +0000 Subject: Add Aura support to views: - change aura GYP_DEFINE to use_aura to be consistent with other switches - add gfx::NativeView/Window typedefs - add NativeWidgetAura/etc. - update some ifdefs and includes to build on windows. http://crbug.com/93944 TEST=none Review URL: http://codereview.chromium.org/7741001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98234 0039d316-1c4b-4281-b951-d872f2087c98 --- views/focus/focus_manager.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'views/focus') diff --git a/views/focus/focus_manager.cc b/views/focus/focus_manager.cc index 4cdc5ae..499e0bc 100644 --- a/views/focus/focus_manager.cc +++ b/views/focus/focus_manager.cc @@ -90,7 +90,7 @@ bool FocusManager::OnKeyEvent(const KeyEvent& event) { // Note that we don't do focus traversal if the root window is not part of the // active window hierarchy as this would mean we have no focused view and // would focus the first focusable view. -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(USE_AURA) HWND top_window = widget_->GetNativeView(); HWND active_window = ::GetActiveWindow(); if ((active_window == top_window || ::IsChild(active_window, top_window)) && -- cgit v1.1