OLD | NEW |
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/shelf/shelf_window_watcher.h" | 5 #include "ash/shelf/shelf_window_watcher.h" |
6 | 6 |
7 #include "ash/public/cpp/config.h" | 7 #include "ash/public/cpp/config.h" |
8 #include "ash/public/cpp/shelf_item.h" | 8 #include "ash/public/cpp/shelf_item.h" |
9 #include "ash/public/cpp/shell_window_ids.h" | 9 #include "ash/public/cpp/shell_window_ids.h" |
10 #include "ash/public/cpp/window_properties.h" | 10 #include "ash/public/cpp/window_properties.h" |
11 #include "ash/root_window_controller.h" | 11 #include "ash/root_window_controller.h" |
12 #include "ash/session/session_controller.h" | 12 #include "ash/session/session_controller.h" |
13 #include "ash/shelf/shelf_model.h" | 13 #include "ash/shelf/shelf_model.h" |
14 #include "ash/shell.h" | 14 #include "ash/shell.h" |
15 #include "ash/shell_port.h" | 15 #include "ash/shell_port.h" |
16 #include "ash/test/ash_test_base.h" | 16 #include "ash/test/ash_test_base.h" |
17 #include "ash/wm/window_resizer.h" | 17 #include "ash/wm/window_resizer.h" |
18 #include "ash/wm/window_state.h" | 18 #include "ash/wm/window_state.h" |
19 #include "ash/wm/window_state_aura.h" | |
20 #include "ash/wm_window.h" | 19 #include "ash/wm_window.h" |
21 #include "base/strings/string_number_conversions.h" | 20 #include "base/strings/string_number_conversions.h" |
22 #include "ui/aura/window.h" | 21 #include "ui/aura/window.h" |
23 #include "ui/base/hit_test.h" | 22 #include "ui/base/hit_test.h" |
24 #include "ui/views/widget/widget.h" | 23 #include "ui/views/widget/widget.h" |
25 | 24 |
26 namespace ash { | 25 namespace ash { |
27 | 26 |
28 class ShelfWindowWatcherTest : public test::AshTestBase { | 27 class ShelfWindowWatcherTest : public test::AshTestBase { |
29 public: | 28 public: |
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
346 CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); | 345 CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect()); |
347 ShelfWindowWatcherTest::CreateShelfItem(widget->GetNativeWindow()); | 346 ShelfWindowWatcherTest::CreateShelfItem(widget->GetNativeWindow()); |
348 EXPECT_EQ(1, model->item_count()); | 347 EXPECT_EQ(1, model->item_count()); |
349 | 348 |
350 // Start the test user session; ShelfWindowWatcher will find the open window. | 349 // Start the test user session; ShelfWindowWatcher will find the open window. |
351 SetSessionStarted(true); | 350 SetSessionStarted(true); |
352 EXPECT_EQ(2, model->item_count()); | 351 EXPECT_EQ(2, model->item_count()); |
353 } | 352 } |
354 | 353 |
355 } // namespace ash | 354 } // namespace ash |
OLD | NEW |