Set aura window focus in NativeWidgetAura::ClearNativeFocus only if the focus...

Set aura window focus in NativeWidgetAura::ClearNativeFocus only if the focus is owned by child window.

 This was causing a focus to be stolen when non active window calls ClearNativeFocus.

BUG=114477
TEST=OmniboxViewTest.PopupAccelerators passes with this change


Review URL: http://codereview.chromium.org/8931022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114561 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

@@ -1131,7 +1131,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, FLAKY_BrowserAccelerators) {
 }
 
 // Flakily fails and times out on Win only.  http://crbug.com/69941
-#if defined(OS_WIN) || defined(USE_AURA)
+#if defined(OS_WIN)
 #define MAYBE_PopupAccelerators DISABLED_PopupAccelerators
 #else
 #define MAYBE_PopupAccelerators PopupAccelerators

ui/views/widget/native_widget_aura.cc

@@ -528,8 +528,10 @@ void NativeWidgetAura::SetCursor(gfx::NativeCursor cursor) {
 }
 
 void NativeWidgetAura::ClearNativeFocus() {
-  if (window_ && window_->GetFocusManager())
+  if (window_ && window_->GetFocusManager() &&
+      window_->Contains(window_->GetFocusManager()->GetFocusedWindow())) {
     window_->GetFocusManager()->SetFocusedWindow(window_);
+  }
 }
 
 void NativeWidgetAura::FocusNativeView(gfx::NativeView native_view) {