| 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/system/tray/system_tray.h" | 5 #include "ash/system/tray/system_tray.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/accessibility_delegate.h" | 9 #include "ash/accessibility_delegate.h" |
| 10 #include "ash/root_window_controller.h" | 10 #include "ash/root_window_controller.h" |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate); | 160 DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate); |
| 161 }; | 161 }; |
| 162 | 162 |
| 163 } // namespace | 163 } // namespace |
| 164 | 164 |
| 165 class SystemTrayTest : public AshTestBase { | 165 class SystemTrayTest : public AshTestBase { |
| 166 public: | 166 public: |
| 167 SystemTrayTest() {} | 167 SystemTrayTest() {} |
| 168 virtual ~SystemTrayTest() {} | 168 virtual ~SystemTrayTest() {} |
| 169 | 169 |
| 170 virtual void SetUp() OVERRIDE { | 170 virtual void SetUp() override { |
| 171 CommandLine::ForCurrentProcess()->AppendSwitch( | 171 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 172 switches::kEnableTouchFeedback); | 172 switches::kEnableTouchFeedback); |
| 173 test::AshTestBase::SetUp(); | 173 test::AshTestBase::SetUp(); |
| 174 } | 174 } |
| 175 | 175 |
| 176 private: | 176 private: |
| 177 DISALLOW_COPY_AND_ASSIGN(SystemTrayTest); | 177 DISALLOW_COPY_AND_ASSIGN(SystemTrayTest); |
| 178 }; | 178 }; |
| 179 | 179 |
| 180 TEST_F(SystemTrayTest, SystemTrayDefaultView) { | 180 TEST_F(SystemTrayTest, SystemTrayDefaultView) { |
| (...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 571 | 571 |
| 572 generator.set_current_location(move_point); | 572 generator.set_current_location(move_point); |
| 573 generator.ReleaseTouch(); | 573 generator.ReleaseTouch(); |
| 574 RunAllPendingInMessageLoop(); | 574 RunAllPendingInMessageLoop(); |
| 575 EXPECT_FALSE(view->active()); | 575 EXPECT_FALSE(view->active()); |
| 576 } | 576 } |
| 577 #endif // OS_CHROMEOS | 577 #endif // OS_CHROMEOS |
| 578 | 578 |
| 579 } // namespace test | 579 } // namespace test |
| 580 } // namespace ash | 580 } // namespace ash |
| OLD | NEW |