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

Side by Side Diff: ash/shelf/shelf_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_tooltip_manager_unittest.cc ('k') | ash/shelf/shelf_view.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 <utility> 5 #include <utility>
6 6
7 #include "ash/common/shelf/shelf_button.h" 7 #include "ash/shelf/shelf_button.h"
8 #include "ash/common/shelf/shelf_model.h" 8 #include "ash/shelf/shelf_model.h"
9 #include "ash/common/shelf/shelf_view.h" 9 #include "ash/shelf/shelf_view.h"
10 #include "ash/common/shelf/shelf_widget.h" 10 #include "ash/shelf/shelf_widget.h"
11 #include "ash/common/shelf/wm_shelf.h" 11 #include "ash/shelf/wm_shelf.h"
12 #include "ash/common/test/test_shelf_item_delegate.h"
13 #include "ash/test/ash_test_base.h" 12 #include "ash/test/ash_test_base.h"
14 #include "ash/test/shelf_view_test_api.h" 13 #include "ash/test/shelf_view_test_api.h"
14 #include "ash/test/test_shelf_item_delegate.h"
15 15
16 namespace ash { 16 namespace ash {
17 17
18 class ShelfTest : public test::AshTestBase { 18 class ShelfTest : public test::AshTestBase {
19 public: 19 public:
20 ShelfTest() : shelf_model_(nullptr) {} 20 ShelfTest() : shelf_model_(nullptr) {}
21 21
22 ~ShelfTest() override {} 22 ~ShelfTest() override {}
23 23
24 void SetUp() override { 24 void SetUp() override {
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 109
110 // Removes the first item in main shelf view. 110 // Removes the first item in main shelf view.
111 shelf_model()->RemoveItemAt(shelf_model()->ItemIndexByID(first_item_id)); 111 shelf_model()->RemoveItemAt(shelf_model()->ItemIndexByID(first_item_id));
112 112
113 // Waits for all transitions to finish and there should be no crash. 113 // Waits for all transitions to finish and there should be no crash.
114 test_api()->RunMessageLoopUntilAnimationsDone(); 114 test_api()->RunMessageLoopUntilAnimationsDone();
115 EXPECT_FALSE(shelf_widget->IsShowingOverflowBubble()); 115 EXPECT_FALSE(shelf_widget->IsShowingOverflowBubble());
116 } 116 }
117 117
118 } // namespace ash 118 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_tooltip_manager_unittest.cc ('k') | ash/shelf/shelf_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698