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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 namespace ash { | 51 namespace ash { |
52 namespace test { | 52 namespace test { |
53 namespace { | 53 namespace { |
54 | 54 |
55 class AshEventGeneratorDelegate : public aura::test::EventGeneratorDelegate { | 55 class AshEventGeneratorDelegate : public aura::test::EventGeneratorDelegate { |
56 public: | 56 public: |
57 AshEventGeneratorDelegate() {} | 57 AshEventGeneratorDelegate() {} |
58 virtual ~AshEventGeneratorDelegate() {} | 58 virtual ~AshEventGeneratorDelegate() {} |
59 | 59 |
60 // aura::test::EventGeneratorDelegate overrides: | 60 // aura::test::EventGeneratorDelegate overrides: |
61 virtual aura::WindowEventDispatcher* GetDispatcherAt( | 61 virtual aura::WindowTreeHost* GetHostAt( |
62 const gfx::Point& point_in_screen) const OVERRIDE { | 62 const gfx::Point& point_in_screen) const OVERRIDE { |
63 gfx::Screen* screen = Shell::GetScreen(); | 63 gfx::Screen* screen = Shell::GetScreen(); |
64 gfx::Display display = screen->GetDisplayNearestPoint(point_in_screen); | 64 gfx::Display display = screen->GetDisplayNearestPoint(point_in_screen); |
65 return Shell::GetInstance()->display_controller()-> | 65 return Shell::GetInstance()->display_controller()-> |
66 GetRootWindowForDisplayId(display.id())->GetHost()->dispatcher(); | 66 GetRootWindowForDisplayId(display.id())->GetHost(); |
67 } | 67 } |
68 | 68 |
69 virtual aura::client::ScreenPositionClient* GetScreenPositionClient( | 69 virtual aura::client::ScreenPositionClient* GetScreenPositionClient( |
70 const aura::Window* window) const OVERRIDE { | 70 const aura::Window* window) const OVERRIDE { |
71 return aura::client::GetScreenPositionClient(window->GetRootWindow()); | 71 return aura::client::GetScreenPositionClient(window->GetRootWindow()); |
72 } | 72 } |
73 | 73 |
74 private: | 74 private: |
75 DISALLOW_COPY_AND_ASSIGN(AshEventGeneratorDelegate); | 75 DISALLOW_COPY_AND_ASSIGN(AshEventGeneratorDelegate); |
76 }; | 76 }; |
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 | 340 |
341 void AshTestBase::UnblockUserSession() { | 341 void AshTestBase::UnblockUserSession() { |
342 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); | 342 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); |
343 SetSessionStarted(true); | 343 SetSessionStarted(true); |
344 SetUserAddingScreenRunning(false); | 344 SetUserAddingScreenRunning(false); |
345 } | 345 } |
346 | 346 |
347 | 347 |
348 } // namespace test | 348 } // namespace test |
349 } // namespace ash | 349 } // namespace ash |
OLD | NEW |