| 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 tray->AddTrayItem(test_item); | 109 tray->AddTrayItem(test_item); |
| 110 tray->ShowDefaultView(BUBBLE_CREATE_NEW); | 110 tray->ShowDefaultView(BUBBLE_CREATE_NEW); |
| 111 RunAllPendingInMessageLoop(); | 111 RunAllPendingInMessageLoop(); |
| 112 tray->ShowDetailedView(test_item, 0, true, BUBBLE_USE_EXISTING); | 112 tray->ShowDetailedView(test_item, 0, true, BUBBLE_USE_EXISTING); |
| 113 RunAllPendingInMessageLoop(); | 113 RunAllPendingInMessageLoop(); |
| 114 | 114 |
| 115 return static_cast<HoverHighlightView*>(test_item->detailed_view()-> | 115 return static_cast<HoverHighlightView*>(test_item->detailed_view()-> |
| 116 footer()->content()); | 116 footer()->content()); |
| 117 } | 117 } |
| 118 | 118 |
| 119 virtual void SetUp() OVERRIDE { | 119 virtual void SetUp() override { |
| 120 CommandLine::ForCurrentProcess()->AppendSwitch( | 120 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 121 switches::kEnableTouchFeedback); | 121 switches::kEnableTouchFeedback); |
| 122 test::AshTestBase::SetUp(); | 122 test::AshTestBase::SetUp(); |
| 123 } | 123 } |
| 124 | 124 |
| 125 private: | 125 private: |
| 126 DISALLOW_COPY_AND_ASSIGN(TrayDetailsViewTest); | 126 DISALLOW_COPY_AND_ASSIGN(TrayDetailsViewTest); |
| 127 }; | 127 }; |
| 128 | 128 |
| 129 TEST_F(TrayDetailsViewTest, TransitionToDefaultViewTest) { | 129 TEST_F(TrayDetailsViewTest, TransitionToDefaultViewTest) { |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 EXPECT_FALSE(view->hover()); | 209 EXPECT_FALSE(view->hover()); |
| 210 | 210 |
| 211 generator.set_current_location(move_point); | 211 generator.set_current_location(move_point); |
| 212 generator.ReleaseTouch(); | 212 generator.ReleaseTouch(); |
| 213 RunAllPendingInMessageLoop(); | 213 RunAllPendingInMessageLoop(); |
| 214 EXPECT_FALSE(view->hover()); | 214 EXPECT_FALSE(view->hover()); |
| 215 } | 215 } |
| 216 | 216 |
| 217 } // namespace test | 217 } // namespace test |
| 218 } // namespace ash | 218 } // namespace ash |
| OLD | NEW |