| OLD | NEW |
|---|
| (Empty) |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | |
| 2 // Use of this source code is governed by a BSD-style license that can be | |
| 3 // found in the LICENSE file. | |
| 4 | |
| 5 #include "ui/aura_shell/workspace/workspace_manager.h" | |
| 6 | |
| 7 #include "ash/wm/activation_controller.h" | |
| 8 #include "ui/aura/client/aura_constants.h" | |
| 9 #include "ui/aura/root_window.h" | |
| 10 #include "ui/aura/screen_aura.h" | |
| 11 #include "ui/aura/test/aura_test_base.h" | |
| 12 #include "ui/aura/window.h" | |
| 13 #include "ui/aura_shell/shell_window_ids.h" | |
| 14 #include "ui/aura_shell/workspace/workspace.h" | |
| 15 #include "ui/aura_shell/workspace/workspace_observer.h" | |
| 16 #include "ui/base/ui_base_types.h" | |
| 17 | |
| 18 namespace { | |
| 19 using aura_shell::internal::Workspace; | |
| 20 using aura_shell::internal::WorkspaceManager; | |
| 21 using aura::Window; | |
| 22 | |
| 23 class TestWorkspaceObserver : public aura_shell::internal::WorkspaceObserver { | |
| 24 public: | |
| 25 explicit TestWorkspaceObserver(WorkspaceManager* manager) | |
| 26 : manager_(manager), | |
| 27 move_source_(NULL), | |
| 28 move_target_(NULL), | |
| 29 active_workspace_(NULL), | |
| 30 old_active_workspace_(NULL) { | |
| 31 manager_->AddObserver(this); | |
| 32 } | |
| 33 | |
| 34 virtual ~TestWorkspaceObserver() { | |
| 35 manager_->RemoveObserver(this); | |
| 36 } | |
| 37 | |
| 38 Window* move_source() { return move_source_; } | |
| 39 Window* move_target() { return move_target_; } | |
| 40 Workspace* active_workspace() { return active_workspace_; } | |
| 41 Workspace* old_active_workspace() { return old_active_workspace_; } | |
| 42 | |
| 43 // Resets the observer states. | |
| 44 void reset() { | |
| 45 active_workspace_ = NULL; | |
| 46 old_active_workspace_ = NULL; | |
| 47 move_source_ = NULL; | |
| 48 move_target_ = NULL; | |
| 49 } | |
| 50 | |
| 51 // Overridden from WorkspaceObserver: | |
| 52 virtual void WindowMoved(WorkspaceManager* manager, | |
| 53 Window* source, | |
| 54 Window* target) { | |
| 55 move_source_ = source; | |
| 56 move_target_ = target; | |
| 57 } | |
| 58 virtual void ActiveWorkspaceChanged(WorkspaceManager* manager, | |
| 59 Workspace* old) { | |
| 60 old_active_workspace_ = old; | |
| 61 active_workspace_ = manager->GetActiveWorkspace(); | |
| 62 } | |
| 63 | |
| 64 private: | |
| 65 WorkspaceManager* manager_; | |
| 66 Window* move_source_; | |
| 67 Window* move_target_; | |
| 68 Workspace* active_workspace_; | |
| 69 Workspace* old_active_workspace_; | |
| 70 | |
| 71 DISALLOW_COPY_AND_ASSIGN(TestWorkspaceObserver); | |
| 72 }; | |
| 73 | |
| 74 } // namespace | |
| 75 | |
| 76 namespace aura_shell { | |
| 77 namespace internal { | |
| 78 | |
| 79 class WorkspaceManagerTestBase : public aura::test::AuraTestBase { | |
| 80 public: | |
| 81 WorkspaceManagerTestBase() { | |
| 82 aura::RootWindow::GetInstance()->set_id( | |
| 83 internal::kShellWindowId_DefaultContainer); | |
| 84 activation_controller_.reset(new internal::ActivationController); | |
| 85 activation_controller_->set_default_container_for_test( | |
| 86 aura::RootWindow::GetInstance()); | |
| 87 } | |
| 88 virtual ~WorkspaceManagerTestBase() {} | |
| 89 | |
| 90 virtual void SetUp() OVERRIDE { | |
| 91 aura::test::AuraTestBase::SetUp(); | |
| 92 manager_.reset(new WorkspaceManager(viewport())); | |
| 93 } | |
| 94 | |
| 95 virtual void TearDown() OVERRIDE { | |
| 96 manager_.reset(); | |
| 97 aura::test::AuraTestBase::TearDown(); | |
| 98 } | |
| 99 | |
| 100 aura::Window* CreateTestWindow() { | |
| 101 aura::Window* window = new aura::Window(NULL); | |
| 102 window->Init(ui::Layer::LAYER_HAS_NO_TEXTURE); | |
| 103 return window; | |
| 104 } | |
| 105 | |
| 106 aura::Window* viewport() { | |
| 107 return aura::RootWindow::GetInstance(); | |
| 108 } | |
| 109 scoped_ptr<WorkspaceManager> manager_; | |
| 110 | |
| 111 private: | |
| 112 scoped_ptr<internal::ActivationController> activation_controller_; | |
| 113 | |
| 114 DISALLOW_COPY_AND_ASSIGN(WorkspaceManagerTestBase); | |
| 115 }; | |
| 116 | |
| 117 class WorkspaceManagerTest : public WorkspaceManagerTestBase { | |
| 118 }; | |
| 119 | |
| 120 TEST_F(WorkspaceManagerTest, WorkspaceManagerCreateAddFind) { | |
| 121 scoped_ptr<Window> w1(CreateTestWindow()); | |
| 122 scoped_ptr<Window> w2(CreateTestWindow()); | |
| 123 | |
| 124 Workspace* ws1 = manager_->CreateWorkspace(); | |
| 125 ws1->AddWindowAfter(w1.get(), NULL); | |
| 126 // w2 is not a part of any workspace yet. | |
| 127 EXPECT_EQ(NULL, manager_->FindBy(w2.get())); | |
| 128 | |
| 129 // w2 is in ws2 workspace. | |
| 130 Workspace* ws2 = manager_->CreateWorkspace(); | |
| 131 ws2->AddWindowAfter(w2.get(), NULL); | |
| 132 EXPECT_EQ(ws2, manager_->FindBy(w2.get())); | |
| 133 | |
| 134 // Make sure |FindBy(w1.get())| still returns | |
| 135 // correct workspace. | |
| 136 EXPECT_EQ(ws1, manager_->FindBy(w1.get())); | |
| 137 | |
| 138 // once workspace is gone, w2 shouldn't match | |
| 139 // any workspace. | |
| 140 delete ws2; | |
| 141 EXPECT_EQ(NULL, manager_->FindBy(w2.get())); | |
| 142 | |
| 143 // Reset now before windows are destroyed. | |
| 144 manager_.reset(); | |
| 145 } | |
| 146 | |
| 147 TEST_F(WorkspaceManagerTest, LayoutWorkspaces) { | |
| 148 manager_->SetWorkspaceSize(gfx::Size(100, 100)); | |
| 149 EXPECT_EQ("0,0 100x100", viewport()->bounds().ToString()); | |
| 150 | |
| 151 Workspace* ws1 = manager_->CreateWorkspace(); | |
| 152 manager_->LayoutWorkspaces(); | |
| 153 | |
| 154 // ws1 is laied out in left most position. | |
| 155 EXPECT_EQ(100, viewport()->bounds().width()); | |
| 156 EXPECT_EQ("0,0 100x100", ws1->bounds().ToString()); | |
| 157 | |
| 158 // ws2 is laied out next to ws1, with 50 margin. | |
| 159 Workspace* ws2 = manager_->CreateWorkspace(); | |
| 160 manager_->LayoutWorkspaces(); | |
| 161 | |
| 162 EXPECT_EQ(250, viewport()->bounds().width()); | |
| 163 EXPECT_EQ("0,0 100x100", ws1->bounds().ToString()); | |
| 164 EXPECT_EQ("150,0 100x100", ws2->bounds().ToString()); | |
| 165 } | |
| 166 | |
| 167 // Makes sure the bounds of window are resized if the workspace size shrinks. | |
| 168 TEST_F(WorkspaceManagerTest, ResizeDuringLayout) { | |
| 169 manager_->SetWorkspaceSize(gfx::Size(100, 100)); | |
| 170 EXPECT_EQ("0,0 100x100", viewport()->bounds().ToString()); | |
| 171 | |
| 172 Workspace* ws1 = manager_->CreateWorkspace(); | |
| 173 scoped_ptr<Window> w1(CreateTestWindow()); | |
| 174 w1->SetBounds(gfx::Rect(0, 0, 100, 100)); | |
| 175 viewport()->AddChild(w1.get()); | |
| 176 EXPECT_TRUE(ws1->AddWindowAfter(w1.get(), NULL)); | |
| 177 manager_->SetWorkspaceSize(gfx::Size(50, 50)); | |
| 178 | |
| 179 // ws1 is laied out in left most position. | |
| 180 EXPECT_EQ("0,0 50x50", ws1->bounds().ToString()); | |
| 181 EXPECT_EQ("0,0 50x50", w1->layer()->GetTargetBounds().ToString()); | |
| 182 } | |
| 183 | |
| 184 TEST_F(WorkspaceManagerTest, WorkspaceManagerDragArea) { | |
| 185 aura::RootWindow::GetInstance()->screen()->set_work_area_insets( | |
| 186 gfx::Insets(10, 10, 10, 10)); | |
| 187 viewport()->SetBounds(gfx::Rect(0, 0, 200, 200)); | |
| 188 EXPECT_EQ("10,10 180x180", manager_->GetDragAreaBounds().ToString()); | |
| 189 } | |
| 190 | |
| 191 TEST_F(WorkspaceManagerTest, WorkspaceManagerActivate) { | |
| 192 TestWorkspaceObserver observer(manager_.get()); | |
| 193 Workspace* ws1 = manager_->CreateWorkspace(); | |
| 194 Workspace* ws2 = manager_->CreateWorkspace(); | |
| 195 EXPECT_EQ(NULL, manager_->GetActiveWorkspace()); | |
| 196 | |
| 197 // Activate ws1. | |
| 198 ws1->Activate(); | |
| 199 EXPECT_EQ(ws1, manager_->GetActiveWorkspace()); | |
| 200 EXPECT_EQ(NULL, observer.old_active_workspace()); | |
| 201 EXPECT_EQ(ws1, observer.active_workspace()); | |
| 202 observer.reset(); | |
| 203 | |
| 204 // Activate ws2. | |
| 205 ws2->Activate(); | |
| 206 EXPECT_EQ(ws2, manager_->GetActiveWorkspace()); | |
| 207 EXPECT_EQ(ws1, observer.old_active_workspace()); | |
| 208 EXPECT_EQ(ws2, observer.active_workspace()); | |
| 209 observer.reset(); | |
| 210 | |
| 211 // Deleting active workspace sets active workspace to NULL. | |
| 212 delete ws2; | |
| 213 EXPECT_EQ(NULL, manager_->GetActiveWorkspace()); | |
| 214 EXPECT_EQ(ws2, observer.old_active_workspace()); | |
| 215 EXPECT_EQ(NULL, observer.active_workspace()); | |
| 216 } | |
| 217 | |
| 218 TEST_F(WorkspaceManagerTest, FindRotateWindow) { | |
| 219 manager_->SetWorkspaceSize(gfx::Size(500, 300)); | |
| 220 | |
| 221 Workspace* ws1 = manager_->CreateWorkspace(); | |
| 222 scoped_ptr<Window> w11(CreateTestWindow()); | |
| 223 w11->SetBounds(gfx::Rect(0, 0, 100, 100)); | |
| 224 ws1->AddWindowAfter(w11.get(), NULL); | |
| 225 | |
| 226 scoped_ptr<Window> w12(CreateTestWindow()); | |
| 227 w12->SetBounds(gfx::Rect(0, 0, 100, 100)); | |
| 228 ws1->AddWindowAfter(w12.get(), NULL); | |
| 229 manager_->LayoutWorkspaces(); | |
| 230 | |
| 231 // Workspaces are 0-<lmgn>-145-<w11>-245-<wmng>-255-<w12>-355-<rmgn>-500. | |
| 232 EXPECT_EQ(NULL, manager_->FindRotateWindowForLocation(gfx::Point(0, 0))); | |
| 233 EXPECT_EQ(NULL, manager_->FindRotateWindowForLocation(gfx::Point(100, 0))); | |
| 234 EXPECT_EQ(w11.get(), | |
| 235 manager_->FindRotateWindowForLocation(gfx::Point(150, 0))); | |
| 236 EXPECT_EQ(w12.get(), | |
| 237 manager_->FindRotateWindowForLocation(gfx::Point(300, 0))); | |
| 238 EXPECT_EQ(NULL, manager_->FindRotateWindowForLocation(gfx::Point(400, 0))); | |
| 239 | |
| 240 w11->SetBounds(gfx::Rect(0, 0, 400, 100)); | |
| 241 w12->SetBounds(gfx::Rect(0, 0, 200, 100)); | |
| 242 manager_->FindBy(w11.get())->Layout(NULL); | |
| 243 EXPECT_EQ(w11.get(), | |
| 244 manager_->FindRotateWindowForLocation(gfx::Point(10, 0))); | |
| 245 EXPECT_EQ(w11.get(), | |
| 246 manager_->FindRotateWindowForLocation(gfx::Point(240, 0))); | |
| 247 EXPECT_EQ(w12.get(), | |
| 248 manager_->FindRotateWindowForLocation(gfx::Point(260, 0))); | |
| 249 EXPECT_EQ(w12.get(), | |
| 250 manager_->FindRotateWindowForLocation(gfx::Point(490, 0))); | |
| 251 | |
| 252 Workspace* ws2 = manager_->CreateWorkspace(); | |
| 253 scoped_ptr<Window> w21(CreateTestWindow()); | |
| 254 w21->SetBounds(gfx::Rect(0, 0, 100, 100)); | |
| 255 ws2->AddWindowAfter(w21.get(), NULL); | |
| 256 manager_->LayoutWorkspaces(); | |
| 257 | |
| 258 // 2nd workspace starts from 500+50 and the window is centered 750-850. | |
| 259 EXPECT_EQ(NULL, manager_->FindRotateWindowForLocation(gfx::Point(600, 0))); | |
| 260 EXPECT_EQ(NULL, manager_->FindRotateWindowForLocation(gfx::Point(740, 0))); | |
| 261 EXPECT_EQ(w21.get(), | |
| 262 manager_->FindRotateWindowForLocation(gfx::Point(760, 0))); | |
| 263 EXPECT_EQ(w21.get(), | |
| 264 manager_->FindRotateWindowForLocation(gfx::Point(840, 0))); | |
| 265 EXPECT_EQ(NULL, manager_->FindRotateWindowForLocation(gfx::Point(860, 0))); | |
| 266 | |
| 267 // Reset now before windows are destroyed. | |
| 268 manager_.reset(); | |
| 269 } | |
| 270 | |
| 271 TEST_F(WorkspaceManagerTest, RotateWindows) { | |
| 272 scoped_ptr<TestWorkspaceObserver> observer( | |
| 273 new TestWorkspaceObserver(manager_.get())); | |
| 274 Workspace* ws1 = manager_->CreateWorkspace(); | |
| 275 Workspace* ws2 = manager_->CreateWorkspace(); | |
| 276 | |
| 277 scoped_ptr<Window> w11(CreateTestWindow()); | |
| 278 ws1->AddWindowAfter(w11.get(), NULL); | |
| 279 | |
| 280 scoped_ptr<Window> w21(CreateTestWindow()); | |
| 281 scoped_ptr<Window> w22(CreateTestWindow()); | |
| 282 ws2->AddWindowAfter(w21.get(), NULL); | |
| 283 ws2->AddWindowAfter(w22.get(), NULL); | |
| 284 | |
| 285 EXPECT_EQ(0, ws1->GetIndexOf(w11.get())); | |
| 286 EXPECT_EQ(0, ws2->GetIndexOf(w21.get())); | |
| 287 EXPECT_EQ(1, ws2->GetIndexOf(w22.get())); | |
| 288 | |
| 289 // Rotate right most to left most. | |
| 290 manager_->RotateWindows(w22.get(), w11.get()); | |
| 291 EXPECT_EQ(w22.get(), observer->move_source()); | |
| 292 EXPECT_EQ(w11.get(), observer->move_target()); | |
| 293 | |
| 294 EXPECT_EQ(0, ws1->GetIndexOf(w22.get())); | |
| 295 EXPECT_EQ(0, ws2->GetIndexOf(w11.get())); | |
| 296 EXPECT_EQ(1, ws2->GetIndexOf(w21.get())); | |
| 297 | |
| 298 // Rotate left most to right most. | |
| 299 manager_->RotateWindows(w22.get(), w21.get()); | |
| 300 EXPECT_EQ(0, ws1->GetIndexOf(w11.get())); | |
| 301 EXPECT_EQ(0, ws2->GetIndexOf(w21.get())); | |
| 302 EXPECT_EQ(1, ws2->GetIndexOf(w22.get())); | |
| 303 EXPECT_EQ(w22.get(), observer->move_source()); | |
| 304 EXPECT_EQ(w21.get(), observer->move_target()); | |
| 305 | |
| 306 // Rotate left most to 1st element in 2nd workspace. | |
| 307 manager_->RotateWindows(w11.get(), w21.get()); | |
| 308 EXPECT_EQ(0, ws1->GetIndexOf(w21.get())); | |
| 309 EXPECT_EQ(0, ws2->GetIndexOf(w11.get())); | |
| 310 EXPECT_EQ(1, ws2->GetIndexOf(w22.get())); | |
| 311 EXPECT_EQ(w11.get(), observer->move_source()); | |
| 312 EXPECT_EQ(w21.get(), observer->move_target()); | |
| 313 | |
| 314 // Rotate middle to right most. | |
| 315 manager_->RotateWindows(w11.get(), w22.get()); | |
| 316 EXPECT_EQ(0, ws1->GetIndexOf(w21.get())); | |
| 317 EXPECT_EQ(0, ws2->GetIndexOf(w22.get())); | |
| 318 EXPECT_EQ(1, ws2->GetIndexOf(w11.get())); | |
| 319 EXPECT_EQ(w11.get(), observer->move_source()); | |
| 320 EXPECT_EQ(w22.get(), observer->move_target()); | |
| 321 | |
| 322 // Rotate middle to left most. | |
| 323 manager_->RotateWindows(w22.get(), w21.get()); | |
| 324 EXPECT_EQ(0, ws1->GetIndexOf(w22.get())); | |
| 325 EXPECT_EQ(0, ws2->GetIndexOf(w21.get())); | |
| 326 EXPECT_EQ(1, ws2->GetIndexOf(w11.get())); | |
| 327 EXPECT_EQ(w22.get(), observer->move_source()); | |
| 328 EXPECT_EQ(w21.get(), observer->move_target()); | |
| 329 | |
| 330 // Reset now before windows are destroyed. | |
| 331 observer.reset(); | |
| 332 manager_.reset(); | |
| 333 } | |
| 334 | |
| 335 class WorkspaceTest : public WorkspaceManagerTestBase { | |
| 336 }; | |
| 337 | |
| 338 TEST_F(WorkspaceTest, WorkspaceBasic) { | |
| 339 Workspace* ws = manager_->CreateWorkspace(); | |
| 340 // Sanity check | |
| 341 EXPECT_TRUE(ws->is_empty()); | |
| 342 | |
| 343 scoped_ptr<Window> w1(CreateTestWindow()); | |
| 344 scoped_ptr<Window> w2(CreateTestWindow()); | |
| 345 scoped_ptr<Window> w3(CreateTestWindow()); | |
| 346 // ws is empty and can accomodate new window. | |
| 347 EXPECT_TRUE(ws->CanAdd(w1.get())); | |
| 348 | |
| 349 // Add w1. | |
| 350 EXPECT_TRUE(ws->AddWindowAfter(w1.get(), NULL)); | |
| 351 EXPECT_TRUE(ws->Contains(w1.get())); | |
| 352 EXPECT_FALSE(ws->is_empty()); | |
| 353 | |
| 354 // The workspac still has room for next window. | |
| 355 EXPECT_TRUE(ws->CanAdd(w2.get())); | |
| 356 EXPECT_TRUE(ws->AddWindowAfter(w2.get(), NULL)); | |
| 357 EXPECT_TRUE(ws->Contains(w2.get())); | |
| 358 | |
| 359 // The workspace no longer accepts new window. | |
| 360 EXPECT_FALSE(ws->CanAdd(w3.get())); | |
| 361 EXPECT_FALSE(ws->AddWindowAfter(w3.get(), NULL)); | |
| 362 EXPECT_FALSE(ws->Contains(w3.get())); | |
| 363 | |
| 364 // Check if the window has correct layout index. | |
| 365 EXPECT_EQ(0, ws->GetIndexOf(w1.get())); | |
| 366 EXPECT_EQ(1, ws->GetIndexOf(w2.get())); | |
| 367 EXPECT_EQ(-1, ws->GetIndexOf(w3.get())); | |
| 368 | |
| 369 // w1 is gone, so no index for w2. | |
| 370 ws->RemoveWindow(w1.get()); | |
| 371 EXPECT_EQ(-1, ws->GetIndexOf(w1.get())); | |
| 372 EXPECT_EQ(0, ws->GetIndexOf(w2.get())); | |
| 373 EXPECT_FALSE(ws->Contains(w1.get())); | |
| 374 | |
| 375 // Add w1 back. w1 now has index = 1. | |
| 376 EXPECT_TRUE(ws->AddWindowAfter(w1.get(), w2.get())); | |
| 377 EXPECT_EQ(0, ws->GetIndexOf(w2.get())); | |
| 378 EXPECT_EQ(1, ws->GetIndexOf(w1.get())); | |
| 379 | |
| 380 // Reset now before windows are destroyed. | |
| 381 manager_.reset(); | |
| 382 } | |
| 383 | |
| 384 TEST_F(WorkspaceTest, RotateWindows) { | |
| 385 size_t orig_max = Workspace::SetMaxWindowsCount(3); | |
| 386 Workspace* ws = manager_->CreateWorkspace(); | |
| 387 scoped_ptr<Window> w1(CreateTestWindow()); | |
| 388 scoped_ptr<Window> w2(CreateTestWindow()); | |
| 389 scoped_ptr<Window> w3(CreateTestWindow()); | |
| 390 ws->AddWindowAfter(w1.get(), NULL); | |
| 391 ws->AddWindowAfter(w2.get(), NULL); | |
| 392 ws->AddWindowAfter(w3.get(), NULL); | |
| 393 | |
| 394 EXPECT_EQ(0, ws->GetIndexOf(w1.get())); | |
| 395 EXPECT_EQ(1, ws->GetIndexOf(w2.get())); | |
| 396 EXPECT_EQ(2, ws->GetIndexOf(w3.get())); | |
| 397 | |
| 398 // Rotate to left. | |
| 399 ws->RotateWindows(w1.get(), w3.get()); | |
| 400 EXPECT_EQ(0, ws->GetIndexOf(w2.get())); | |
| 401 EXPECT_EQ(1, ws->GetIndexOf(w3.get())); | |
| 402 EXPECT_EQ(2, ws->GetIndexOf(w1.get())); | |
| 403 | |
| 404 // Rotate to right. | |
| 405 ws->RotateWindows(w1.get(), w2.get()); | |
| 406 EXPECT_EQ(0, ws->GetIndexOf(w1.get())); | |
| 407 EXPECT_EQ(1, ws->GetIndexOf(w2.get())); | |
| 408 EXPECT_EQ(2, ws->GetIndexOf(w3.get())); | |
| 409 | |
| 410 // Rotating to the middle from left. | |
| 411 ws->RotateWindows(w1.get(), w2.get()); | |
| 412 EXPECT_EQ(0, ws->GetIndexOf(w2.get())); | |
| 413 EXPECT_EQ(1, ws->GetIndexOf(w1.get())); | |
| 414 EXPECT_EQ(2, ws->GetIndexOf(w3.get())); | |
| 415 | |
| 416 // Rotating to the middle from right. | |
| 417 ws->RotateWindows(w3.get(), w1.get()); | |
| 418 EXPECT_EQ(0, ws->GetIndexOf(w2.get())); | |
| 419 EXPECT_EQ(1, ws->GetIndexOf(w3.get())); | |
| 420 EXPECT_EQ(2, ws->GetIndexOf(w1.get())); | |
| 421 | |
| 422 // Reset now before windows are destroyed. | |
| 423 manager_.reset(); | |
| 424 Workspace::SetMaxWindowsCount(orig_max); | |
| 425 } | |
| 426 | |
| 427 TEST_F(WorkspaceTest, ShiftWindowsSingle) { | |
| 428 Workspace* ws = manager_->CreateWorkspace(); | |
| 429 // Single window in a workspace case. | |
| 430 scoped_ptr<Window> w1(CreateTestWindow()); | |
| 431 ws->AddWindowAfter(w1.get(), NULL); | |
| 432 | |
| 433 scoped_ptr<Window> w2(CreateTestWindow()); | |
| 434 | |
| 435 // Sanity check. | |
| 436 EXPECT_EQ(0, ws->GetIndexOf(w1.get())); | |
| 437 EXPECT_EQ(-1, ws->GetIndexOf(w2.get())); | |
| 438 | |
| 439 // Insert |w2| at the beginning and shift. | |
| 440 aura::Window* overflow = | |
| 441 ws->ShiftWindows( | |
| 442 w2.get(), w2.get(), NULL, Workspace::SHIFT_TO_RIGHT); | |
| 443 EXPECT_EQ(w1.get(), overflow); | |
| 444 EXPECT_EQ(-1, ws->GetIndexOf(w1.get())); | |
| 445 EXPECT_EQ(0, ws->GetIndexOf(w2.get())); | |
| 446 | |
| 447 // Insert |w1| at the end and shift. | |
| 448 overflow = ws->ShiftWindows( | |
| 449 w1.get(), w1.get(), NULL, Workspace::SHIFT_TO_LEFT); | |
| 450 EXPECT_EQ(w2.get(), overflow); | |
| 451 EXPECT_EQ(-1, ws->GetIndexOf(w2.get())); | |
| 452 EXPECT_EQ(0, ws->GetIndexOf(w1.get())); | |
| 453 | |
| 454 // Insert |w2| at the begining and shift up to the w1. | |
| 455 overflow = ws->ShiftWindows( | |
| 456 w2.get(), w1.get(), NULL, Workspace::SHIFT_TO_RIGHT); | |
| 457 EXPECT_EQ(NULL, overflow); | |
| 458 EXPECT_EQ(-1, ws->GetIndexOf(w1.get())); | |
| 459 EXPECT_EQ(0, ws->GetIndexOf(w2.get())); | |
| 460 | |
| 461 // Insert |w1| at the end and shift up to the w2. | |
| 462 overflow = ws->ShiftWindows( | |
| 463 w1.get(), w2.get(), NULL, Workspace::SHIFT_TO_LEFT); | |
| 464 EXPECT_EQ(NULL, overflow); | |
| 465 EXPECT_EQ(-1, ws->GetIndexOf(w2.get())); | |
| 466 EXPECT_EQ(0, ws->GetIndexOf(w1.get())); | |
| 467 | |
| 468 // Reset now before windows are destroyed. | |
| 469 manager_.reset(); | |
| 470 } | |
| 471 | |
| 472 TEST_F(WorkspaceTest, ShiftWindowsMultiple) { | |
| 473 Workspace* ws = manager_->CreateWorkspace(); | |
| 474 // Single window in a workspace case. | |
| 475 scoped_ptr<Window> w1(CreateTestWindow()); | |
| 476 scoped_ptr<Window> w2(CreateTestWindow()); | |
| 477 ws->AddWindowAfter(w1.get(), NULL); | |
| 478 ws->AddWindowAfter(w2.get(), NULL); | |
| 479 | |
| 480 scoped_ptr<Window> w3(CreateTestWindow()); | |
| 481 | |
| 482 // Sanity check. | |
| 483 EXPECT_EQ(0, ws->GetIndexOf(w1.get())); | |
| 484 EXPECT_EQ(1, ws->GetIndexOf(w2.get())); | |
| 485 EXPECT_EQ(-1, ws->GetIndexOf(w3.get())); | |
| 486 | |
| 487 // Insert |w3| at the beginning and shift. | |
| 488 aura::Window* overflow = | |
| 489 ws->ShiftWindows(w3.get(), w3.get(), NULL, | |
| 490 Workspace::SHIFT_TO_RIGHT); | |
| 491 EXPECT_EQ(w2.get(), overflow); | |
| 492 EXPECT_EQ(-1, ws->GetIndexOf(w2.get())); | |
| 493 EXPECT_EQ(0, ws->GetIndexOf(w3.get())); | |
| 494 EXPECT_EQ(1, ws->GetIndexOf(w1.get())); | |
| 495 | |
| 496 // Insert |w3| at the end and shift. | |
| 497 overflow = ws->ShiftWindows(w2.get(), w2.get(), NULL, | |
| 498 Workspace::SHIFT_TO_LEFT); | |
| 499 EXPECT_EQ(w3.get(), overflow); | |
| 500 EXPECT_EQ(-1, ws->GetIndexOf(w3.get())); | |
| 501 EXPECT_EQ(0, ws->GetIndexOf(w1.get())); | |
| 502 EXPECT_EQ(1, ws->GetIndexOf(w2.get())); | |
| 503 | |
| 504 // Insert |w3| at the begining and shift up to the w1. | |
| 505 overflow = ws->ShiftWindows(w3.get(), w1.get(), NULL, | |
| 506 Workspace::SHIFT_TO_RIGHT); | |
| 507 EXPECT_EQ(NULL, overflow); | |
| 508 EXPECT_EQ(-1, ws->GetIndexOf(w1.get())); | |
| 509 EXPECT_EQ(0, ws->GetIndexOf(w3.get())); | |
| 510 EXPECT_EQ(1, ws->GetIndexOf(w2.get())); | |
| 511 | |
| 512 // Insert |w1| at the end and shift up to the w2. | |
| 513 overflow = ws->ShiftWindows(w1.get(), w2.get(), NULL, | |
| 514 Workspace::SHIFT_TO_LEFT); | |
| 515 EXPECT_EQ(NULL, overflow); | |
| 516 EXPECT_EQ(-1, ws->GetIndexOf(w2.get())); | |
| 517 EXPECT_EQ(0, ws->GetIndexOf(w3.get())); | |
| 518 EXPECT_EQ(1, ws->GetIndexOf(w1.get())); | |
| 519 | |
| 520 scoped_ptr<Window> unused(CreateTestWindow()); | |
| 521 | |
| 522 // Insert |w2| at the |w3| and shift to right. | |
| 523 overflow = ws->ShiftWindows(w2.get(), unused.get(), w3.get(), | |
| 524 Workspace::SHIFT_TO_RIGHT); | |
| 525 EXPECT_EQ(w1.get(), overflow); | |
| 526 EXPECT_EQ(-1, ws->GetIndexOf(w1.get())); | |
| 527 EXPECT_EQ(0, ws->GetIndexOf(w2.get())); | |
| 528 EXPECT_EQ(1, ws->GetIndexOf(w3.get())); | |
| 529 | |
| 530 // Insert |w1| at the |w2| and shift to left. | |
| 531 overflow = ws->ShiftWindows(w1.get(), unused.get(), w2.get(), | |
| 532 Workspace::SHIFT_TO_LEFT); | |
| 533 EXPECT_EQ(w2.get(), overflow); | |
| 534 EXPECT_EQ(-1, ws->GetIndexOf(w2.get())); | |
| 535 EXPECT_EQ(0, ws->GetIndexOf(w1.get())); | |
| 536 EXPECT_EQ(1, ws->GetIndexOf(w3.get())); | |
| 537 | |
| 538 // Reset now before windows are destroyed. | |
| 539 manager_.reset(); | |
| 540 } | |
| 541 | |
| 542 TEST_F(WorkspaceTest, ContainsFullscreenWindow) { | |
| 543 Workspace* ws = manager_->CreateWorkspace(); | |
| 544 scoped_ptr<Window> w1(CreateTestWindow()); | |
| 545 scoped_ptr<Window> w2(CreateTestWindow()); | |
| 546 ws->AddWindowAfter(w1.get(), NULL); | |
| 547 ws->AddWindowAfter(w2.get(), NULL); | |
| 548 w1->Show(); | |
| 549 w2->Show(); | |
| 550 | |
| 551 EXPECT_FALSE(ws->ContainsFullscreenWindow()); | |
| 552 | |
| 553 w1->SetIntProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN); | |
| 554 EXPECT_TRUE(ws->ContainsFullscreenWindow()); | |
| 555 | |
| 556 w1->SetIntProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); | |
| 557 EXPECT_FALSE(ws->ContainsFullscreenWindow()); | |
| 558 | |
| 559 w2->SetIntProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN); | |
| 560 EXPECT_TRUE(ws->ContainsFullscreenWindow()); | |
| 561 | |
| 562 w2->Hide(); | |
| 563 EXPECT_FALSE(ws->ContainsFullscreenWindow()); | |
| 564 } | |
| 565 | |
| 566 } // namespace internal | |
| 567 } // namespace aura_shell | |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 9035001:
Move some more WM functionality down into ash. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/