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

Side by Side Diff: ash/common/shelf/shelf_window_watcher_unittest.cc

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase to get WorkspaceLayoutManagerSoloTest change Created 3 years, 9 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/common/shelf/shelf_window_watcher.h" 5 #include "ash/common/shelf/shelf_window_watcher.h"
6 6
7 #include "ash/common/session/session_state_delegate.h" 7 #include "ash/common/session/session_controller.h"
8 #include "ash/common/shelf/shelf_model.h" 8 #include "ash/common/shelf/shelf_model.h"
9 #include "ash/common/wm/window_resizer.h" 9 #include "ash/common/wm/window_resizer.h"
10 #include "ash/common/wm/window_state.h" 10 #include "ash/common/wm/window_state.h"
11 #include "ash/common/wm_shell.h" 11 #include "ash/common/wm_shell.h"
12 #include "ash/common/wm_window.h" 12 #include "ash/common/wm_window.h"
13 #include "ash/public/cpp/shelf_item.h" 13 #include "ash/public/cpp/shelf_item.h"
14 #include "ash/public/cpp/shell_window_ids.h" 14 #include "ash/public/cpp/shell_window_ids.h"
15 #include "ash/public/cpp/window_properties.h" 15 #include "ash/public/cpp/window_properties.h"
16 #include "ash/root_window_controller.h" 16 #include "ash/root_window_controller.h"
17 #include "ash/shell.h" 17 #include "ash/shell.h"
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 child_window.reset(); 370 child_window.reset();
371 window.reset(); 371 window.reset();
372 EXPECT_EQ(initial_item_count, model_->item_count()); 372 EXPECT_EQ(initial_item_count, model_->item_count());
373 } 373 }
374 374
375 // Ensures ShelfWindowWatcher supports windows opened prior to session start. 375 // Ensures ShelfWindowWatcher supports windows opened prior to session start.
376 using ShelfWindowWatcherSessionStartTest = test::NoSessionAshTestBase; 376 using ShelfWindowWatcherSessionStartTest = test::NoSessionAshTestBase;
377 TEST_F(ShelfWindowWatcherSessionStartTest, PreExistingWindow) { 377 TEST_F(ShelfWindowWatcherSessionStartTest, PreExistingWindow) {
378 ShelfModel* model = WmShell::Get()->shelf_model(); 378 ShelfModel* model = WmShell::Get()->shelf_model();
379 ASSERT_FALSE( 379 ASSERT_FALSE(
380 WmShell::Get()->GetSessionStateDelegate()->IsActiveUserSessionStarted()); 380 WmShell::Get()->session_controller()->IsActiveUserSessionStarted());
381 381
382 // ShelfModel only has an APP_LIST item. 382 // ShelfModel only has an APP_LIST item.
383 EXPECT_EQ(1, model->item_count()); 383 EXPECT_EQ(1, model->item_count());
384 384
385 // Construct a window that should get a shelf item once the session starts. 385 // Construct a window that should get a shelf item once the session starts.
386 std::unique_ptr<views::Widget> widget = 386 std::unique_ptr<views::Widget> widget =
387 CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); 387 CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
388 WmWindow* window = WmWindow::Get(widget->GetNativeWindow()); 388 WmWindow* window = WmWindow::Get(widget->GetNativeWindow());
389 ShelfWindowWatcherTest::CreateShelfItem(window); 389 ShelfWindowWatcherTest::CreateShelfItem(window);
390 EXPECT_EQ(1, model->item_count()); 390 EXPECT_EQ(1, model->item_count());
391 391
392 // Start the test user session; ShelfWindowWatcher will find the open window. 392 // Start the test user session; ShelfWindowWatcher will find the open window.
393 SetSessionStarted(true); 393 SetSessionStarted(true);
394 EXPECT_EQ(2, model->item_count()); 394 EXPECT_EQ(2, model->item_count());
395 } 395 }
396 396
397 } // namespace ash 397 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_widget.cc ('k') | ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698