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

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

Issue 2889413002: chromeos: nukes window_state_aura (Closed)
Patch Set: merge, remove include from windows and shuffle functions for declaration Created 3 years, 7 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.cc ('k') | ash/shell/toplevel_window.cc » ('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/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
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
OLDNEW
« no previous file with comments | « ash/shelf/shelf_window_watcher.cc ('k') | ash/shell/toplevel_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698