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

Side by Side Diff: chrome/browser/chromeos/login/lock_window_aura.cc

Issue 8771015: Rename Desktop->RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/chromeos/login/lock_window_aura.h" 5 #include "chrome/browser/chromeos/login/lock_window_aura.h"
6 6
7 #include "ui/aura/desktop.h" 7 #include "ui/aura/root_window.h"
8 #include "ui/aura/window.h" 8 #include "ui/aura/window.h"
9 #include "ui/aura_shell/shell.h" 9 #include "ui/aura_shell/shell.h"
10 #include "ui/aura_shell/shell_window_ids.h" 10 #include "ui/aura_shell/shell_window_ids.h"
11 11
12 namespace chromeos { 12 namespace chromeos {
13 13
14 LockWindow* LockWindow::Create() { 14 LockWindow* LockWindow::Create() {
15 return new LockWindowAura(); 15 return new LockWindowAura();
16 } 16 }
17 17
(...skipping 15 matching lines...) Expand all
33 LockWindowAura::LockWindowAura() { 33 LockWindowAura::LockWindowAura() {
34 Init(); 34 Init();
35 } 35 }
36 36
37 LockWindowAura::~LockWindowAura() { 37 LockWindowAura::~LockWindowAura() {
38 } 38 }
39 39
40 void LockWindowAura::Init() { 40 void LockWindowAura::Init() {
41 views::Widget::InitParams params( 41 views::Widget::InitParams params(
42 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); 42 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
43 params.bounds = gfx::Rect(aura::Desktop::GetInstance()->GetHostSize()); 43 params.bounds = gfx::Rect(aura::RootWindow::GetInstance()->GetHostSize());
44 // TODO(flackr): Use a property to specify this container rather than 44 // TODO(flackr): Use a property to specify this container rather than
45 // depending on shell implementation. 45 // depending on shell implementation.
46 params.parent = aura_shell::Shell::GetInstance()->GetContainer( 46 params.parent = aura_shell::Shell::GetInstance()->GetContainer(
47 aura_shell::internal::kShellWindowId_LockScreenContainer); 47 aura_shell::internal::kShellWindowId_LockScreenContainer);
48 views::Widget::Init(params); 48 views::Widget::Init(params);
49 } 49 }
50 50
51 } // namespace chromeos 51 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_extra_parts_aura.cc ('k') | chrome/browser/fullscreen_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698