| 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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 }; | 145 }; |
| 146 | 146 |
| 147 } // namespace | 147 } // namespace |
| 148 | 148 |
| 149 class SystemTrayTest : public AshTestBase { | 149 class SystemTrayTest : public AshTestBase { |
| 150 public: | 150 public: |
| 151 SystemTrayTest() {} | 151 SystemTrayTest() {} |
| 152 ~SystemTrayTest() override {} | 152 ~SystemTrayTest() override {} |
| 153 | 153 |
| 154 void SetUp() override { | 154 void SetUp() override { |
| 155 CommandLine::ForCurrentProcess()->AppendSwitch( | 155 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| 156 switches::kEnableTouchFeedback); | 156 switches::kEnableTouchFeedback); |
| 157 test::AshTestBase::SetUp(); | 157 test::AshTestBase::SetUp(); |
| 158 } | 158 } |
| 159 | 159 |
| 160 private: | 160 private: |
| 161 DISALLOW_COPY_AND_ASSIGN(SystemTrayTest); | 161 DISALLOW_COPY_AND_ASSIGN(SystemTrayTest); |
| 162 }; | 162 }; |
| 163 | 163 |
| 164 TEST_F(SystemTrayTest, SystemTrayDefaultView) { | 164 TEST_F(SystemTrayTest, SystemTrayDefaultView) { |
| 165 SystemTray* tray = GetSystemTray(); | 165 SystemTray* tray = GetSystemTray(); |
| (...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 555 | 555 |
| 556 generator.set_current_location(move_point); | 556 generator.set_current_location(move_point); |
| 557 generator.ReleaseTouch(); | 557 generator.ReleaseTouch(); |
| 558 RunAllPendingInMessageLoop(); | 558 RunAllPendingInMessageLoop(); |
| 559 EXPECT_FALSE(view->active()); | 559 EXPECT_FALSE(view->active()); |
| 560 } | 560 } |
| 561 #endif // OS_CHROMEOS | 561 #endif // OS_CHROMEOS |
| 562 | 562 |
| 563 } // namespace test | 563 } // namespace test |
| 564 } // namespace ash | 564 } // namespace ash |
| OLD | NEW |