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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 } | 245 } |
246 | 246 |
247 aura::Window* AshTestBase::CreateTestWindowInShellWithDelegateAndType( | 247 aura::Window* AshTestBase::CreateTestWindowInShellWithDelegateAndType( |
248 aura::WindowDelegate* delegate, | 248 aura::WindowDelegate* delegate, |
249 ui::wm::WindowType type, | 249 ui::wm::WindowType type, |
250 int id, | 250 int id, |
251 const gfx::Rect& bounds) { | 251 const gfx::Rect& bounds) { |
252 aura::Window* window = new aura::Window(delegate); | 252 aura::Window* window = new aura::Window(delegate); |
253 window->set_id(id); | 253 window->set_id(id); |
254 window->SetType(type); | 254 window->SetType(type); |
255 window->Init(ui::LAYER_TEXTURED); | 255 window->Init(aura::WINDOW_LAYER_TEXTURED); |
256 window->Show(); | 256 window->Show(); |
257 | 257 |
258 if (bounds.IsEmpty()) { | 258 if (bounds.IsEmpty()) { |
259 ParentWindowInPrimaryRootWindow(window); | 259 ParentWindowInPrimaryRootWindow(window); |
260 } else { | 260 } else { |
261 gfx::Display display = | 261 gfx::Display display = |
262 Shell::GetScreen()->GetDisplayMatching(bounds); | 262 Shell::GetScreen()->GetDisplayMatching(bounds); |
263 aura::Window* root = ash::Shell::GetInstance()->display_controller()-> | 263 aura::Window* root = ash::Shell::GetInstance()->display_controller()-> |
264 GetRootWindowForDisplayId(display.id()); | 264 GetRootWindowForDisplayId(display.id()); |
265 gfx::Point origin = bounds.origin(); | 265 gfx::Point origin = bounds.origin(); |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 | 337 |
338 void AshTestBase::UnblockUserSession() { | 338 void AshTestBase::UnblockUserSession() { |
339 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); | 339 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); |
340 SetSessionStarted(true); | 340 SetSessionStarted(true); |
341 SetUserAddingScreenRunning(false); | 341 SetUserAddingScreenRunning(false); |
342 } | 342 } |
343 | 343 |
344 | 344 |
345 } // namespace test | 345 } // namespace test |
346 } // namespace ash | 346 } // namespace ash |
OLD | NEW |