| 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/system/tray/tray_details_view.h" | 5 #include "ash/system/tray/tray_details_view.h" |
| 6 | 6 |
| 7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/shelf/shelf_widget.h" | 8 #include "ash/shelf/shelf_widget.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/system/status_area_widget.h" | 10 #include "ash/system/status_area_widget.h" |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 tray->ShowDefaultView(BUBBLE_CREATE_NEW); | 104 tray->ShowDefaultView(BUBBLE_CREATE_NEW); |
| 105 RunAllPendingInMessageLoop(); | 105 RunAllPendingInMessageLoop(); |
| 106 tray->ShowDetailedView(test_item, 0, true, BUBBLE_USE_EXISTING); | 106 tray->ShowDetailedView(test_item, 0, true, BUBBLE_USE_EXISTING); |
| 107 RunAllPendingInMessageLoop(); | 107 RunAllPendingInMessageLoop(); |
| 108 | 108 |
| 109 return static_cast<HoverHighlightView*>(test_item->detailed_view()-> | 109 return static_cast<HoverHighlightView*>(test_item->detailed_view()-> |
| 110 footer()->content()); | 110 footer()->content()); |
| 111 } | 111 } |
| 112 | 112 |
| 113 void SetUp() override { | 113 void SetUp() override { |
| 114 CommandLine::ForCurrentProcess()->AppendSwitch( | 114 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| 115 switches::kEnableTouchFeedback); | 115 switches::kEnableTouchFeedback); |
| 116 test::AshTestBase::SetUp(); | 116 test::AshTestBase::SetUp(); |
| 117 } | 117 } |
| 118 | 118 |
| 119 private: | 119 private: |
| 120 DISALLOW_COPY_AND_ASSIGN(TrayDetailsViewTest); | 120 DISALLOW_COPY_AND_ASSIGN(TrayDetailsViewTest); |
| 121 }; | 121 }; |
| 122 | 122 |
| 123 TEST_F(TrayDetailsViewTest, TransitionToDefaultViewTest) { | 123 TEST_F(TrayDetailsViewTest, TransitionToDefaultViewTest) { |
| 124 SystemTray* tray = GetSystemTray(); | 124 SystemTray* tray = GetSystemTray(); |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 EXPECT_FALSE(view->hover()); | 203 EXPECT_FALSE(view->hover()); |
| 204 | 204 |
| 205 generator.set_current_location(move_point); | 205 generator.set_current_location(move_point); |
| 206 generator.ReleaseTouch(); | 206 generator.ReleaseTouch(); |
| 207 RunAllPendingInMessageLoop(); | 207 RunAllPendingInMessageLoop(); |
| 208 EXPECT_FALSE(view->hover()); | 208 EXPECT_FALSE(view->hover()); |
| 209 } | 209 } |
| 210 | 210 |
| 211 } // namespace test | 211 } // namespace test |
| 212 } // namespace ash | 212 } // namespace ash |
| OLD | NEW |