Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(504)

Side by Side Diff: ash/test/ash_test_base.cc

Issue 1050713002: aura: Remove layerless windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: layerless: rebase Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/wm/ash_focus_rules_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 } 247 }
248 248
249 aura::Window* AshTestBase::CreateTestWindowInShellWithDelegateAndType( 249 aura::Window* AshTestBase::CreateTestWindowInShellWithDelegateAndType(
250 aura::WindowDelegate* delegate, 250 aura::WindowDelegate* delegate,
251 ui::wm::WindowType type, 251 ui::wm::WindowType type,
252 int id, 252 int id,
253 const gfx::Rect& bounds) { 253 const gfx::Rect& bounds) {
254 aura::Window* window = new aura::Window(delegate); 254 aura::Window* window = new aura::Window(delegate);
255 window->set_id(id); 255 window->set_id(id);
256 window->SetType(type); 256 window->SetType(type);
257 window->Init(aura::WINDOW_LAYER_TEXTURED); 257 window->Init(ui::LAYER_TEXTURED);
258 window->Show(); 258 window->Show();
259 259
260 if (bounds.IsEmpty()) { 260 if (bounds.IsEmpty()) {
261 ParentWindowInPrimaryRootWindow(window); 261 ParentWindowInPrimaryRootWindow(window);
262 } else { 262 } else {
263 gfx::Display display = 263 gfx::Display display =
264 Shell::GetScreen()->GetDisplayMatching(bounds); 264 Shell::GetScreen()->GetDisplayMatching(bounds);
265 aura::Window* root = ash::Shell::GetInstance()->display_controller()-> 265 aura::Window* root = ash::Shell::GetInstance()->display_controller()->
266 GetRootWindowForDisplayId(display.id()); 266 GetRootWindowForDisplayId(display.id());
267 gfx::Point origin = bounds.origin(); 267 gfx::Point origin = bounds.origin();
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 346
347 void AshTestBase::UnblockUserSession() { 347 void AshTestBase::UnblockUserSession() {
348 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); 348 Shell::GetInstance()->session_state_delegate()->UnlockScreen();
349 SetSessionStarted(true); 349 SetSessionStarted(true);
350 SetUserAddingScreenRunning(false); 350 SetUserAddingScreenRunning(false);
351 } 351 }
352 352
353 353
354 } // namespace test 354 } // namespace test
355 } // namespace ash 355 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/wm/ash_focus_rules_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698