Aura: Focus() in ShowAndFocusNativeWindowAura

chrome/test/base/interactive_test_utils_aura.cc

 // Copyright (c) 2012 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 "chrome/test/base/interactive_test_utils_aura.h"
 
 #include "build/build_config.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "ui/aura/window.h"
 
 namespace ui_test_utils {
 
 #if !defined(OS_WIN)
 void HideNativeWindow(gfx::NativeWindow window) {
   HideNativeWindowAura(window);
 }
 
 bool ShowAndFocusNativeWindow(gfx::NativeWindow window) {
   return ShowAndFocusNativeWindowAura(window);
 }
 #endif
 
 void HideNativeWindowAura(gfx::NativeWindow window) {
   window->Hide();
 }
 
 bool ShowAndFocusNativeWindowAura(gfx::NativeWindow window) {
   window->Show();
-  return true;
+  if (!window->IsVisible())
+    return false;

[sky, 2016/09/23 16:27:56]

is this branch actually getting hit? If so, where?

[Tom (Use chromium acct), 2016/09/23 20:34:57]

No

[sky, 2016/09/26 01:48:17]

Then can it be removed?

[Tom (Use chromium acct), 2016/09/26 19:15:41]

Done.

+  window->Focus();
+  return window->HasFocus();

[Tom (Use chromium acct), 2016/09/23 20:34:57]

HasFocus() is returning false.  This is because in
FocusController::FocusAndActivateWindow (focus_controller.cc:190), the window is
active, but not focused, so we early-return without getting focus.

[sky, 2016/09/26 01:48:17]

That is not necessarily problematic. What is the test case that fails?

[Tom (Use chromium acct), 2016/09/26 19:15:41]

Lots of them.  The example I was using to test was
WebViewPointerLockInteractiveTest.PointerLock_PointerLockLostWithFocus

I just changed this to return true like it was before :P

 }
 
 }  // namespace ui_test_utils