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/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 #endif | 48 #endif |
49 | 49 |
50 #if defined(USE_X11) | 50 #if defined(USE_X11) |
51 #include "ui/gfx/x/x11_connection.h" | 51 #include "ui/gfx/x/x11_connection.h" |
52 #endif | 52 #endif |
53 | 53 |
54 namespace ash { | 54 namespace ash { |
55 namespace test { | 55 namespace test { |
56 namespace { | 56 namespace { |
57 | 57 |
58 class AshEventGeneratorDelegate : public aura::test::EventGeneratorDelegate { | 58 class AshEventGeneratorDelegate |
| 59 : public aura::test::EventGeneratorDelegateAura { |
59 public: | 60 public: |
60 AshEventGeneratorDelegate() {} | 61 AshEventGeneratorDelegate() {} |
61 virtual ~AshEventGeneratorDelegate() {} | 62 virtual ~AshEventGeneratorDelegate() {} |
62 | 63 |
63 // aura::test::EventGeneratorDelegate overrides: | 64 // aura::test::EventGeneratorDelegate overrides: |
64 virtual aura::WindowTreeHost* GetHostAt( | 65 virtual aura::WindowTreeHost* GetHostAt( |
65 const gfx::Point& point_in_screen) const OVERRIDE { | 66 const gfx::Point& point_in_screen) const OVERRIDE { |
66 gfx::Screen* screen = Shell::GetScreen(); | 67 gfx::Screen* screen = Shell::GetScreen(); |
67 gfx::Display display = screen->GetDisplayNearestPoint(point_in_screen); | 68 gfx::Display display = screen->GetDisplayNearestPoint(point_in_screen); |
68 return Shell::GetInstance()->display_controller()-> | 69 return Shell::GetInstance()->display_controller()-> |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 | 335 |
335 void AshTestBase::UnblockUserSession() { | 336 void AshTestBase::UnblockUserSession() { |
336 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); | 337 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); |
337 SetSessionStarted(true); | 338 SetSessionStarted(true); |
338 SetUserAddingScreenRunning(false); | 339 SetUserAddingScreenRunning(false); |
339 } | 340 } |
340 | 341 |
341 | 342 |
342 } // namespace test | 343 } // namespace test |
343 } // namespace ash | 344 } // namespace ash |
OLD | NEW |