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

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

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: 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
« no previous file with comments | « ash/shelf/shelf_window_watcher_item_delegate.cc ('k') | ash/shelf/wm_shelf.h » ('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 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/shelf/shelf_window_watcher.h"
6 6
7 #include "ash/common/session/session_state_delegate.h"
8 #include "ash/common/shelf/shelf_item_types.h"
9 #include "ash/common/shelf/shelf_model.h"
10 #include "ash/common/wm/window_resizer.h"
11 #include "ash/common/wm/window_state.h"
12 #include "ash/common/wm_shell.h"
13 #include "ash/common/wm_window.h"
14 #include "ash/public/cpp/shell_window_ids.h" 7 #include "ash/public/cpp/shell_window_ids.h"
15 #include "ash/public/cpp/window_properties.h" 8 #include "ash/public/cpp/window_properties.h"
16 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/session/session_state_delegate.h"
11 #include "ash/shelf/shelf_item_types.h"
12 #include "ash/shelf/shelf_model.h"
17 #include "ash/test/ash_test_base.h" 13 #include "ash/test/ash_test_base.h"
14 #include "ash/wm/window_resizer.h"
15 #include "ash/wm/window_state.h"
16 #include "ash/wm_shell.h"
17 #include "ash/wm_window.h"
18 #include "ui/base/hit_test.h" 18 #include "ui/base/hit_test.h"
19 #include "ui/views/widget/widget.h" 19 #include "ui/views/widget/widget.h"
20 20
21 namespace ash { 21 namespace ash {
22 22
23 class ShelfWindowWatcherTest : public test::AshTestBase { 23 class ShelfWindowWatcherTest : public test::AshTestBase {
24 public: 24 public:
25 ShelfWindowWatcherTest() : model_(nullptr) {} 25 ShelfWindowWatcherTest() : model_(nullptr) {}
26 ~ShelfWindowWatcherTest() override {} 26 ~ShelfWindowWatcherTest() override {}
27 27
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 WmWindow* window = WmWindow::Get(widget->GetNativeWindow()); 386 WmWindow* window = WmWindow::Get(widget->GetNativeWindow());
387 ShelfWindowWatcherTest::CreateShelfItem(window); 387 ShelfWindowWatcherTest::CreateShelfItem(window);
388 EXPECT_EQ(1, model->item_count()); 388 EXPECT_EQ(1, model->item_count());
389 389
390 // Start the test user session; ShelfWindowWatcher will find the open window. 390 // Start the test user session; ShelfWindowWatcher will find the open window.
391 SetSessionStarted(true); 391 SetSessionStarted(true);
392 EXPECT_EQ(2, model->item_count()); 392 EXPECT_EQ(2, model->item_count());
393 } 393 }
394 394
395 } // namespace ash 395 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_window_watcher_item_delegate.cc ('k') | ash/shelf/wm_shelf.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698