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

Side by Side Diff: ash/wm/window_cycle_controller_unittest.cc

Issue 10827237: Enabling Extended Deskop by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/tooltips/tooltip_controller_unittest.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/window_cycle_controller.h" 5 #include "ash/wm/window_cycle_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/display/display_controller.h" 9 #include "ash/display/display_controller.h"
10 #include "ash/display/multi_display_manager.h" 10 #include "ash/display/multi_display_manager.h"
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 controller->HandleCycleWindow(WindowCycleController::FORWARD, true); 334 controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
335 EXPECT_TRUE(wm::IsActiveWindow(window2.get())); 335 EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
336 336
337 controller->HandleCycleWindow(WindowCycleController::FORWARD, true); 337 controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
338 EXPECT_TRUE(wm::IsActiveWindow(window1.get())); 338 EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
339 339
340 controller->HandleCycleWindow(WindowCycleController::FORWARD, true); 340 controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
341 EXPECT_TRUE(wm::IsActiveWindow(window0.get())); 341 EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
342 } 342 }
343 343
344 TEST_F(WindowCycleControllerTest, DISABLED_AlwaysOnTopMultipleRootWindows) { 344 TEST_F(WindowCycleControllerTest, AlwaysOnTopMultipleRootWindows) {
345 // Set up a second root window 345 // Set up a second root window
346 UpdateDisplay("0+0-1000x600,1001+0-600x400"); 346 UpdateDisplay("0+0-1000x600,1001+0-600x400");
347 Shell::RootWindowList root_windows = Shell::GetAllRootWindows(); 347 Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
348 ASSERT_EQ(2U, root_windows.size()); 348 ASSERT_EQ(2U, root_windows.size());
349 349
350 // Move the active root window to the secondary. 350 // Move the active root window to the secondary.
351 Shell::GetInstance()->set_active_root_window(root_windows[1]); 351 Shell::GetInstance()->set_active_root_window(root_windows[1]);
352 352
353 WindowCycleController* controller = 353 WindowCycleController* controller =
354 Shell::GetInstance()->window_cycle_controller(); 354 Shell::GetInstance()->window_cycle_controller();
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 controller->HandleCycleWindow(WindowCycleController::FORWARD, true); 457 controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
458 EXPECT_TRUE(wm::IsActiveWindow(window2.get())); 458 EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
459 459
460 controller->HandleCycleWindow(WindowCycleController::FORWARD, true); 460 controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
461 EXPECT_TRUE(wm::IsActiveWindow(window0.get())); 461 EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
462 } 462 }
463 463
464 } // namespace 464 } // namespace
465 465
466 } // namespace ash 466 } // namespace ash
OLDNEW
« no previous file with comments | « ash/tooltips/tooltip_controller_unittest.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698