OLD | NEW |
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 "ash/common/system/tray/tray_details_view.h" | 5 #include "ash/common/system/tray/tray_details_view.h" |
6 | 6 |
7 #include "ash/common/material_design/material_design_controller.h" | 7 #include "ash/common/material_design/material_design_controller.h" |
8 #include "ash/common/system/tray/hover_highlight_view.h" | 8 #include "ash/common/system/tray/hover_highlight_view.h" |
9 #include "ash/common/system/tray/special_popup_row.h" | 9 #include "ash/common/system/tray/special_popup_row.h" |
10 #include "ash/common/system/tray/system_tray.h" | 10 #include "ash/common/system/tray/system_tray.h" |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 RunAllPendingInMessageLoop(); | 160 RunAllPendingInMessageLoop(); |
161 | 161 |
162 // Show the detailed view of item 2. | 162 // Show the detailed view of item 2. |
163 tray->ShowDetailedView(test_item_2, 0, true, BUBBLE_USE_EXISTING); | 163 tray->ShowDetailedView(test_item_2, 0, true, BUBBLE_USE_EXISTING); |
164 EXPECT_TRUE(test_item_2->detailed_view()); | 164 EXPECT_TRUE(test_item_2->detailed_view()); |
165 RunAllPendingInMessageLoop(); | 165 RunAllPendingInMessageLoop(); |
166 EXPECT_FALSE(test_item_2->default_view()); | 166 EXPECT_FALSE(test_item_2->default_view()); |
167 | 167 |
168 // Transition back to default view, the default view of item 2 should have | 168 // Transition back to default view, the default view of item 2 should have |
169 // focus. | 169 // focus. |
| 170 tray->GetSystemBubble()->bubble_view()->set_can_activate(true); |
170 test_item_2->detailed_view()->FocusTitleRow(); | 171 test_item_2->detailed_view()->FocusTitleRow(); |
171 TransitionFromDetailedToDefaultView(test_item_2->detailed_view()); | 172 TransitionFromDetailedToDefaultView(test_item_2->detailed_view()); |
172 RunAllPendingInMessageLoop(); | 173 RunAllPendingInMessageLoop(); |
173 | 174 |
174 EXPECT_TRUE(test_item_2->default_view()); | 175 EXPECT_TRUE(test_item_2->default_view()); |
175 EXPECT_FALSE(test_item_2->detailed_view()); | 176 EXPECT_FALSE(test_item_2->detailed_view()); |
176 EXPECT_TRUE(test_item_2->default_view()->HasFocus()); | 177 EXPECT_TRUE(test_item_2->default_view()->HasFocus()); |
177 | 178 |
178 // Show the detailed view of item 2 again. | 179 // Show the detailed view of item 2 again. |
179 tray->ShowDetailedView(test_item_2, 0, true, BUBBLE_USE_EXISTING); | 180 tray->ShowDetailedView(test_item_2, 0, true, BUBBLE_USE_EXISTING); |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
291 gfx::Rect bounds = button->GetBoundsInScreen(); | 292 gfx::Rect bounds = button->GetBoundsInScreen(); |
292 gfx::Point initial_point(bounds.x() - 1, bounds.y()); | 293 gfx::Point initial_point(bounds.x() - 1, bounds.y()); |
293 generator.set_current_location(initial_point); | 294 generator.set_current_location(initial_point); |
294 generator.MoveMouseBy(1, 0); | 295 generator.MoveMouseBy(1, 0); |
295 RunAllPendingInMessageLoop(); | 296 RunAllPendingInMessageLoop(); |
296 EXPECT_TRUE(button->background()); | 297 EXPECT_TRUE(button->background()); |
297 } | 298 } |
298 | 299 |
299 } // namespace test | 300 } // namespace test |
300 } // namespace ash | 301 } // namespace ash |
OLD | NEW |