Call XSetInputFocus after XRaiseWindow when activating.

ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc

 // Copyright (c) 2013 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 "ui/views/widget/desktop_aura/desktop_screen_x11.h"
 
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/views/test/views_test_base.h"
@@ skipping 181 matching lines @@
                                   gfx::Rect(640, 0, 1024, 768)));
   displays.push_back(gfx::Display(kSecondDisplay, gfx::Rect(0, 0, 640, 480)));
   screen()->ProcessDisplayChange(displays);
 
   // The first display in the list is always the primary, even if other
   // displays are to the left in screen layout.
   EXPECT_EQ(kFirstDisplay, screen()->GetPrimaryDisplay().id());
 }
 
 TEST_F(DesktopScreenX11Test, GetWindowAtScreenPoint) {
-  Widget* window_one = BuildTopLevelDesktopWidget(gfx::Rect(10, 10, 10, 10));
-  Widget* window_two = BuildTopLevelDesktopWidget(gfx::Rect(50, 50, 10, 10));
-  Widget* window_three = BuildTopLevelDesktopWidget(gfx::Rect(15, 15, 20, 20));
+  Widget* window_one = BuildTopLevelDesktopWidget(gfx::Rect(110, 110, 10, 10));
+  Widget* window_two = BuildTopLevelDesktopWidget(gfx::Rect(150, 150, 10, 10));
+  Widget* window_three =
+      BuildTopLevelDesktopWidget(gfx::Rect(115, 115, 20, 20));
+
+  window_three->Show();
+  window_two->Show();
+  window_one->Show();
 
   // Make sure the internal state of DesktopWindowTreeHostX11 is set up
   // correctly.
   ASSERT_EQ(3u, DesktopWindowTreeHostX11::GetAllOpenWindows().size());
 
   EXPECT_EQ(window_one->GetNativeWindow(),
-            screen()->GetWindowAtScreenPoint(gfx::Point(15, 15)));
+            screen()->GetWindowAtScreenPoint(gfx::Point(115, 115)));
   EXPECT_EQ(window_two->GetNativeWindow(),
-            screen()->GetWindowAtScreenPoint(gfx::Point(55, 55)));
+            screen()->GetWindowAtScreenPoint(gfx::Point(155, 155)));
   EXPECT_EQ(NULL,
-            screen()->GetWindowAtScreenPoint(gfx::Point(100, 100)));
+            screen()->GetWindowAtScreenPoint(gfx::Point(200, 200)));
 
   // Bring the third window in front. It overlaps with the first window.
   // Hit-testing on the intersecting region should give the third window.
   window_three->Activate();
   EXPECT_EQ(window_three->GetNativeWindow(),
-            screen()->GetWindowAtScreenPoint(gfx::Point(15, 15)));
+            screen()->GetWindowAtScreenPoint(gfx::Point(115, 115)));
 
   window_one->CloseNow();
   window_two->CloseNow();
+  window_three->CloseNow();
 }
 
 TEST_F(DesktopScreenX11Test, GetDisplayNearestWindow) {
   // Set up a two monitor situation.
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   displays.push_back(gfx::Display(kSecondDisplay,
                                   gfx::Rect(640, 0, 1024, 768)));
   screen()->ProcessDisplayChange(displays);
 
   Widget* window_one = BuildTopLevelDesktopWidget(gfx::Rect(10, 10, 10, 10));
   Widget* window_two = BuildTopLevelDesktopWidget(gfx::Rect(650, 50, 10, 10));
 
   EXPECT_EQ(
       kFirstDisplay,
       screen()->GetDisplayNearestWindow(window_one->GetNativeWindow()).id());
   EXPECT_EQ(
       kSecondDisplay,
       screen()->GetDisplayNearestWindow(window_two->GetNativeWindow()).id());
 
   window_one->CloseNow();
   window_two->CloseNow();
 }
 
 }  // namespace views