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/common/shelf/shelf_view.h" | 5 #include "ash/common/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/overflow_button.h" | 15 #include "ash/common/shelf/overflow_button.h" |
16 #include "ash/common/shelf/shelf_button.h" | 16 #include "ash/common/shelf/shelf_button.h" |
17 #include "ash/common/shelf/shelf_constants.h" | 17 #include "ash/common/shelf/shelf_constants.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/shelf/shelf_widget.h" | 20 #include "ash/common/shelf/shelf_widget.h" |
21 #include "ash/common/shelf/wm_shelf.h" | 21 #include "ash/common/shelf/wm_shelf.h" |
22 #include "ash/common/shelf/wm_shelf_observer.h" | 22 #include "ash/common/shelf/wm_shelf_observer.h" |
23 #include "ash/common/system/web_notification/web_notification_tray.h" | |
24 #include "ash/common/test/test_shelf_delegate.h" | 23 #include "ash/common/test/test_shelf_delegate.h" |
25 #include "ash/common/test/test_shelf_item_delegate.h" | 24 #include "ash/common/test/test_shelf_item_delegate.h" |
26 #include "ash/common/test/test_system_tray_delegate.h" | 25 #include "ash/common/test/test_system_tray_delegate.h" |
27 #include "ash/common/wm_shell.h" | 26 #include "ash/common/wm_shell.h" |
28 #include "ash/common/wm_window.h" | 27 #include "ash/common/wm_window.h" |
29 #include "ash/public/cpp/shell_window_ids.h" | 28 #include "ash/public/cpp/shell_window_ids.h" |
30 #include "ash/root_window_controller.h" | 29 #include "ash/root_window_controller.h" |
31 #include "ash/shell.h" | 30 #include "ash/shell.h" |
| 31 #include "ash/system/web_notification/web_notification_tray.h" |
32 #include "ash/test/ash_test_base.h" | 32 #include "ash/test/ash_test_base.h" |
33 #include "ash/test/ash_test_helper.h" | 33 #include "ash/test/ash_test_helper.h" |
34 #include "ash/test/overflow_bubble_view_test_api.h" | 34 #include "ash/test/overflow_bubble_view_test_api.h" |
35 #include "ash/test/shelf_view_test_api.h" | 35 #include "ash/test/shelf_view_test_api.h" |
36 #include "ash/test/test_shell_delegate.h" | 36 #include "ash/test/test_shell_delegate.h" |
37 #include "base/i18n/rtl.h" | 37 #include "base/i18n/rtl.h" |
38 #include "base/macros.h" | 38 #include "base/macros.h" |
39 #include "base/memory/ptr_util.h" | 39 #include "base/memory/ptr_util.h" |
40 #include "base/run_loop.h" | 40 #include "base/run_loop.h" |
41 #include "base/strings/string_number_conversions.h" | 41 #include "base/strings/string_number_conversions.h" |
(...skipping 2965 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3007 EXPECT_EQ(views::InkDropState::ACTIVATED, | 3007 EXPECT_EQ(views::InkDropState::ACTIVATED, |
3008 overflow_button_ink_drop_->GetTargetInkDropState()); | 3008 overflow_button_ink_drop_->GetTargetInkDropState()); |
3009 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), | 3009 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), |
3010 IsEmpty()); | 3010 IsEmpty()); |
3011 | 3011 |
3012 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); | 3012 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); |
3013 } | 3013 } |
3014 | 3014 |
3015 } // namespace test | 3015 } // namespace test |
3016 } // namespace ash | 3016 } // namespace ash |
OLD | NEW |