OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_view.h" | 5 #include "ash/shelf/shelf_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <memory> | 8 #include <memory> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
| 12 #include "ash/common/shelf/overflow_bubble.h" |
| 13 #include "ash/common/shelf/overflow_bubble_view.h" |
12 #include "ash/common/shelf/shelf_constants.h" | 14 #include "ash/common/shelf/shelf_constants.h" |
13 #include "ash/common/shelf/shelf_item_delegate_manager.h" | 15 #include "ash/common/shelf/shelf_item_delegate_manager.h" |
14 #include "ash/common/shelf/shelf_menu_model.h" | 16 #include "ash/common/shelf/shelf_menu_model.h" |
15 #include "ash/common/shelf/shelf_model.h" | 17 #include "ash/common/shelf/shelf_model.h" |
16 #include "ash/common/shell_window_ids.h" | 18 #include "ash/common/shell_window_ids.h" |
17 #include "ash/root_window_controller.h" | 19 #include "ash/root_window_controller.h" |
18 #include "ash/shelf/app_list_button.h" | 20 #include "ash/shelf/app_list_button.h" |
19 #include "ash/shelf/overflow_bubble.h" | |
20 #include "ash/shelf/overflow_bubble_view.h" | |
21 #include "ash/shelf/shelf.h" | 21 #include "ash/shelf/shelf.h" |
22 #include "ash/shelf/shelf_button.h" | 22 #include "ash/shelf/shelf_button.h" |
23 #include "ash/shelf/shelf_icon_observer.h" | 23 #include "ash/shelf/shelf_icon_observer.h" |
24 #include "ash/shelf/shelf_tooltip_manager.h" | 24 #include "ash/shelf/shelf_tooltip_manager.h" |
25 #include "ash/shelf/shelf_widget.h" | 25 #include "ash/shelf/shelf_widget.h" |
26 #include "ash/shell.h" | 26 #include "ash/shell.h" |
27 #include "ash/test/ash_test_base.h" | 27 #include "ash/test/ash_test_base.h" |
28 #include "ash/test/ash_test_helper.h" | 28 #include "ash/test/ash_test_helper.h" |
29 #include "ash/test/material_design_controller_test_api.h" | 29 #include "ash/test/material_design_controller_test_api.h" |
30 #include "ash/test/overflow_bubble_view_test_api.h" | 30 #include "ash/test/overflow_bubble_view_test_api.h" |
(...skipping 2560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2591 test_api_->CloseMenu(); | 2591 test_api_->CloseMenu(); |
2592 EXPECT_EQ(views::InkDropState::HIDDEN, | 2592 EXPECT_EQ(views::InkDropState::HIDDEN, |
2593 browser_button_ink_drop_->GetTargetInkDropState()); | 2593 browser_button_ink_drop_->GetTargetInkDropState()); |
2594 EXPECT_THAT(browser_button_ink_drop_->GetAndResetRequestedStates(), | 2594 EXPECT_THAT(browser_button_ink_drop_->GetAndResetRequestedStates(), |
2595 ElementsAre(views::InkDropState::ACTIVATED, | 2595 ElementsAre(views::InkDropState::ACTIVATED, |
2596 views::InkDropState::DEACTIVATED)); | 2596 views::InkDropState::DEACTIVATED)); |
2597 } | 2597 } |
2598 | 2598 |
2599 } // namespace test | 2599 } // namespace test |
2600 } // namespace ash | 2600 } // namespace ash |
OLD | NEW |