wm: Make _NET_ACTIVE_WINDOW contain transient windows.

src/platform/window_manager/panel_bar_test.cc

 // Copyright (c) 2009 The Chromium OS 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 <gflags/gflags.h>
 #include <gtest/gtest.h>
 
 #include "base/scoped_ptr.h"
 #include "base/logging.h"
 #include "window_manager/clutter_interface.h"
@@ skipping 25 matching lines @@
 TEST_F(PanelBarTest, Basic) {
   // First, create a toplevel window.
   XWindow toplevel_xid = CreateSimpleWindow();
   MockXConnection::WindowInfo* toplevel_info =
       xconn_->GetWindowInfoOrDie(toplevel_xid);
   SendInitialEventsForWindow(toplevel_xid);
 
   // It should be initially focused.
   EXPECT_EQ(toplevel_xid, xconn_->focused_xid());
   SendFocusEvents(xconn_->GetRootWindow(), toplevel_xid);
-  EXPECT_EQ(toplevel_xid, wm_->active_window_xid());
+  EXPECT_EQ(toplevel_xid, GetActiveWindowProperty());
 
   // Now create a panel titlebar, and then the actual panel window.
   const int initial_titlebar_height = 16;
   XWindow titlebar_xid = CreateTitlebarWindow(100, initial_titlebar_height);
   MockXConnection::WindowInfo* titlebar_info =
       xconn_->GetWindowInfoOrDie(titlebar_xid);
   SendInitialEventsForWindow(titlebar_xid);
 
   const int initial_panel_width = 250;
   const int initial_panel_height = 400;
@@ skipping 55 matching lines @@
   MockXConnection::InitButtonPressEvent(
       &event, panel_xid, 0, 0, 1);  // x, y, button
   EXPECT_TRUE(wm_->HandleEvent(&event));
   EXPECT_EQ(None, xconn_->pointer_grab_xid());
   EXPECT_EQ(panel_xid, xconn_->focused_xid());
   EXPECT_FALSE(panel_info->all_buttons_grabbed);
 
   // Send FocusOut and FocusIn events and check that the active window hint
   // is updated to contain the panel window.
   SendFocusEvents(toplevel_xid, panel_xid);
-  EXPECT_EQ(panel_xid, wm_->active_window_xid());
+  EXPECT_EQ(panel_xid, GetActiveWindowProperty());
 
   // Create a second toplevel window.
   XWindow toplevel_xid2 = CreateSimpleWindow();
   MockXConnection::WindowInfo* toplevel_info2 =
       xconn_->GetWindowInfoOrDie(toplevel_xid2);
   SendInitialEventsForWindow(toplevel_xid2);
   Window* toplevel_win2 = wm_->GetWindow(toplevel_xid2);
   ASSERT_TRUE(toplevel_win2 != NULL);
 
   // The panel's and titlebar's client and composited windows should be
@@ skipping 41 matching lines @@
   EXPECT_TRUE(panel->is_expanded());
   EXPECT_EQ(panel_xid, xconn_->focused_xid());
   EXPECT_EQ(panel_xid, GetActiveWindowProperty());
 }
 
 }  // namespace chromeos
 
 int main(int argc, char **argv) {
   return chromeos::InitAndRunTests(&argc, argv, &FLAGS_logtostderr);
 }