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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 } | 173 } |
174 | 174 |
175 ui::test::EventGenerator& AshTestBase::GetEventGenerator() { | 175 ui::test::EventGenerator& AshTestBase::GetEventGenerator() { |
176 if (!event_generator_) { | 176 if (!event_generator_) { |
177 event_generator_.reset( | 177 event_generator_.reset( |
178 new ui::test::EventGenerator(new AshEventGeneratorDelegate())); | 178 new ui::test::EventGenerator(new AshEventGeneratorDelegate())); |
179 } | 179 } |
180 return *event_generator_.get(); | 180 return *event_generator_.get(); |
181 } | 181 } |
182 | 182 |
183 gfx::Display::Rotation AshTestBase::GetActiveDisplayRotation(int64 id) { | 183 gfx::Display::Rotation AshTestBase::GetActiveDisplayRotation(int64_t id) { |
184 return Shell::GetInstance() | 184 return Shell::GetInstance() |
185 ->display_manager() | 185 ->display_manager() |
186 ->GetDisplayInfo(id) | 186 ->GetDisplayInfo(id) |
187 .GetActiveRotation(); | 187 .GetActiveRotation(); |
188 } | 188 } |
189 | 189 |
190 gfx::Display::Rotation AshTestBase::GetCurrentInternalDisplayRotation() { | 190 gfx::Display::Rotation AshTestBase::GetCurrentInternalDisplayRotation() { |
191 return GetActiveDisplayRotation(gfx::Display::InternalDisplayId()); | 191 return GetActiveDisplayRotation(gfx::Display::InternalDisplayId()); |
192 } | 192 } |
193 | 193 |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
338 | 338 |
339 void AshTestBase::DisableIME() { | 339 void AshTestBase::DisableIME() { |
340 Shell::GetInstance()->RemovePreTargetHandler( | 340 Shell::GetInstance()->RemovePreTargetHandler( |
341 Shell::GetInstance() | 341 Shell::GetInstance() |
342 ->window_tree_host_manager() | 342 ->window_tree_host_manager() |
343 ->input_method_event_handler()); | 343 ->input_method_event_handler()); |
344 } | 344 } |
345 | 345 |
346 } // namespace test | 346 } // namespace test |
347 } // namespace ash | 347 } // namespace ash |
OLD | NEW |