Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(895)

Unified Diff: src/platform/window_manager/panel_bar_test.cc

Issue 506026: wm: Make _NET_ACTIVE_WINDOW contain transient windows. (Closed)
Patch Set: Created 11 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/platform/window_manager/layout_manager_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/platform/window_manager/panel_bar_test.cc
diff --git a/src/platform/window_manager/panel_bar_test.cc b/src/platform/window_manager/panel_bar_test.cc
index 3a9a2e0d5319db5e2407dd867e33f9852ecda6b7..7770c58d399dac6642b697caac962353ad5328be 100644
--- a/src/platform/window_manager/panel_bar_test.cc
+++ b/src/platform/window_manager/panel_bar_test.cc
@@ -43,7 +43,7 @@ TEST_F(PanelBarTest, Basic) {
// 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;
@@ -119,7 +119,7 @@ TEST_F(PanelBarTest, Basic) {
// 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();
« no previous file with comments | « src/platform/window_manager/layout_manager_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698