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/test/ash_test_base.h" | 5 #include "ash/test/ash_test_base.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/display/extended_mouse_warp_controller.h" | 10 #include "ash/display/extended_mouse_warp_controller.h" |
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 | 182 |
183 ash_test_helper_->TearDown(); | 183 ash_test_helper_->TearDown(); |
184 | 184 |
185 event_generator_.reset(); | 185 event_generator_.reset(); |
186 // Some tests set an internal display id, | 186 // Some tests set an internal display id, |
187 // reset it here, so other tests will continue in a clean environment. | 187 // reset it here, so other tests will continue in a clean environment. |
188 display::Display::SetInternalDisplayId(display::kInvalidDisplayId); | 188 display::Display::SetInternalDisplayId(display::kInvalidDisplayId); |
189 } | 189 } |
190 | 190 |
191 // static | 191 // static |
192 WmShelf* AshTestBase::GetPrimaryShelf() { | 192 Shelf* AshTestBase::GetPrimaryShelf() { |
193 return Shell::GetPrimaryRootWindowController()->GetShelf(); | 193 return Shell::GetPrimaryRootWindowController()->GetShelf(); |
194 } | 194 } |
195 | 195 |
196 // static | 196 // static |
197 SystemTray* AshTestBase::GetPrimarySystemTray() { | 197 SystemTray* AshTestBase::GetPrimarySystemTray() { |
198 return Shell::Get()->GetPrimarySystemTray(); | 198 return Shell::Get()->GetPrimarySystemTray(); |
199 } | 199 } |
200 | 200 |
201 ui::test::EventGenerator& AshTestBase::GetEventGenerator() { | 201 ui::test::EventGenerator& AshTestBase::GetEventGenerator() { |
202 if (!event_generator_) { | 202 if (!event_generator_) { |
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
482 return display::Screen::GetScreen()->GetDisplayNearestWindow( | 482 return display::Screen::GetScreen()->GetDisplayNearestWindow( |
483 Shell::GetPrimaryRootWindow()); | 483 Shell::GetPrimaryRootWindow()); |
484 } | 484 } |
485 | 485 |
486 display::Display AshTestBase::GetSecondaryDisplay() { | 486 display::Display AshTestBase::GetSecondaryDisplay() { |
487 return ash_test_helper_->GetSecondaryDisplay(); | 487 return ash_test_helper_->GetSecondaryDisplay(); |
488 } | 488 } |
489 | 489 |
490 } // namespace test | 490 } // namespace test |
491 } // namespace ash | 491 } // namespace ash |
OLD | NEW |