| 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/public/cpp/config.h" | 12 #include "ash/public/cpp/config.h" |
| 13 #include "ash/public/cpp/shelf_item_delegate.h" | 13 #include "ash/public/cpp/shelf_item_delegate.h" |
| 14 #include "ash/public/cpp/shelf_model.h" |
| 14 #include "ash/public/cpp/shell_window_ids.h" | 15 #include "ash/public/cpp/shell_window_ids.h" |
| 15 #include "ash/root_window_controller.h" | 16 #include "ash/root_window_controller.h" |
| 16 #include "ash/shelf/app_list_button.h" | 17 #include "ash/shelf/app_list_button.h" |
| 17 #include "ash/shelf/overflow_bubble.h" | 18 #include "ash/shelf/overflow_bubble.h" |
| 18 #include "ash/shelf/overflow_bubble_view.h" | 19 #include "ash/shelf/overflow_bubble_view.h" |
| 19 #include "ash/shelf/overflow_button.h" | 20 #include "ash/shelf/overflow_button.h" |
| 20 #include "ash/shelf/shelf.h" | 21 #include "ash/shelf/shelf.h" |
| 21 #include "ash/shelf/shelf_button.h" | 22 #include "ash/shelf/shelf_button.h" |
| 22 #include "ash/shelf/shelf_constants.h" | 23 #include "ash/shelf/shelf_constants.h" |
| 23 #include "ash/shelf/shelf_model.h" | |
| 24 #include "ash/shelf/shelf_observer.h" | 24 #include "ash/shelf/shelf_observer.h" |
| 25 #include "ash/shelf/shelf_tooltip_manager.h" | 25 #include "ash/shelf/shelf_tooltip_manager.h" |
| 26 #include "ash/shelf/shelf_widget.h" | 26 #include "ash/shelf/shelf_widget.h" |
| 27 #include "ash/shell.h" | 27 #include "ash/shell.h" |
| 28 #include "ash/shell_port.h" | 28 #include "ash/shell_port.h" |
| 29 #include "ash/system/web_notification/web_notification_tray.h" | 29 #include "ash/system/web_notification/web_notification_tray.h" |
| 30 #include "ash/test/ash_test_base.h" | 30 #include "ash/test/ash_test_base.h" |
| 31 #include "ash/test/ash_test_helper.h" | 31 #include "ash/test/ash_test_helper.h" |
| 32 #include "ash/test/overflow_bubble_view_test_api.h" | 32 #include "ash/test/overflow_bubble_view_test_api.h" |
| 33 #include "ash/test/overflow_button_test_api.h" | 33 #include "ash/test/overflow_button_test_api.h" |
| (...skipping 3100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3134 EXPECT_EQ(views::InkDropState::ACTIVATED, | 3134 EXPECT_EQ(views::InkDropState::ACTIVATED, |
| 3135 overflow_button_ink_drop_->GetTargetInkDropState()); | 3135 overflow_button_ink_drop_->GetTargetInkDropState()); |
| 3136 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), | 3136 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), |
| 3137 IsEmpty()); | 3137 IsEmpty()); |
| 3138 | 3138 |
| 3139 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); | 3139 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); |
| 3140 } | 3140 } |
| 3141 | 3141 |
| 3142 } // namespace test | 3142 } // namespace test |
| 3143 } // namespace ash | 3143 } // namespace ash |
| OLD | NEW |