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/app_list_button.h" | 12 #include "ash/common/shelf/app_list_button.h" |
13 #include "ash/common/shelf/overflow_bubble.h" | 13 #include "ash/common/shelf/overflow_bubble.h" |
14 #include "ash/common/shelf/overflow_bubble_view.h" | 14 #include "ash/common/shelf/overflow_bubble_view.h" |
15 #include "ash/common/shelf/shelf_button.h" | 15 #include "ash/common/shelf/shelf_button.h" |
16 #include "ash/common/shelf/shelf_constants.h" | 16 #include "ash/common/shelf/shelf_constants.h" |
17 #include "ash/common/shelf/shelf_menu_model.h" | 17 #include "ash/common/shelf/shelf_menu_model.h" |
18 #include "ash/common/shelf/shelf_model.h" | 18 #include "ash/common/shelf/shelf_model.h" |
19 #include "ash/common/shelf/shelf_tooltip_manager.h" | 19 #include "ash/common/shelf/shelf_tooltip_manager.h" |
20 #include "ash/common/shell_window_ids.h" | 20 #include "ash/common/shell_window_ids.h" |
| 21 #include "ash/common/test/material_design_controller_test_api.h" |
21 #include "ash/common/wm_shell.h" | 22 #include "ash/common/wm_shell.h" |
22 #include "ash/root_window_controller.h" | 23 #include "ash/root_window_controller.h" |
23 #include "ash/shelf/shelf.h" | 24 #include "ash/shelf/shelf.h" |
24 #include "ash/shelf/shelf_icon_observer.h" | 25 #include "ash/shelf/shelf_icon_observer.h" |
25 #include "ash/shelf/shelf_widget.h" | 26 #include "ash/shelf/shelf_widget.h" |
26 #include "ash/shell.h" | 27 #include "ash/shell.h" |
27 #include "ash/test/ash_test_base.h" | 28 #include "ash/test/ash_test_base.h" |
28 #include "ash/test/ash_test_helper.h" | 29 #include "ash/test/ash_test_helper.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" |
31 #include "ash/test/shelf_test_api.h" | 31 #include "ash/test/shelf_test_api.h" |
32 #include "ash/test/shelf_view_test_api.h" | 32 #include "ash/test/shelf_view_test_api.h" |
33 #include "ash/test/test_shelf_delegate.h" | 33 #include "ash/test/test_shelf_delegate.h" |
34 #include "ash/test/test_shelf_item_delegate.h" | 34 #include "ash/test/test_shelf_item_delegate.h" |
35 #include "ash/test/test_shell_delegate.h" | 35 #include "ash/test/test_shell_delegate.h" |
36 #include "ash/test/test_system_tray_delegate.h" | 36 #include "ash/test/test_system_tray_delegate.h" |
37 #include "base/compiler_specific.h" | 37 #include "base/compiler_specific.h" |
38 #include "base/i18n/rtl.h" | 38 #include "base/i18n/rtl.h" |
39 #include "base/memory/ptr_util.h" | 39 #include "base/memory/ptr_util.h" |
(...skipping 2535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2575 test_api_->CloseMenu(); | 2575 test_api_->CloseMenu(); |
2576 EXPECT_EQ(views::InkDropState::HIDDEN, | 2576 EXPECT_EQ(views::InkDropState::HIDDEN, |
2577 browser_button_ink_drop_->GetTargetInkDropState()); | 2577 browser_button_ink_drop_->GetTargetInkDropState()); |
2578 EXPECT_THAT(browser_button_ink_drop_->GetAndResetRequestedStates(), | 2578 EXPECT_THAT(browser_button_ink_drop_->GetAndResetRequestedStates(), |
2579 ElementsAre(views::InkDropState::ACTIVATED, | 2579 ElementsAre(views::InkDropState::ACTIVATED, |
2580 views::InkDropState::DEACTIVATED)); | 2580 views::InkDropState::DEACTIVATED)); |
2581 } | 2581 } |
2582 | 2582 |
2583 } // namespace test | 2583 } // namespace test |
2584 } // namespace ash | 2584 } // namespace ash |
OLD | NEW |