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

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

Issue 10810039: 2nd display should show the same background as login/lock screen: (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add OVERRIDE Created 8 years, 4 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/wm/root_window_layout_manager.cc ('k') | chrome/browser/chromeos/login/screen_locker.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 "chrome/browser/chromeos/login/lock_window_aura.h" 5 #include "chrome/browser/chromeos/login/lock_window_aura.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/wm/window_animations.h" 9 #include "ash/wm/window_animations.h"
10 #include "base/command_line.h"
11 #include "chrome/common/chrome_switches.h"
10 #include "ui/aura/root_window.h" 12 #include "ui/aura/root_window.h"
11 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
12 14
13 namespace chromeos { 15 namespace chromeos {
14 16
15 LockWindow* LockWindow::Create() { 17 LockWindow* LockWindow::Create() {
16 return new LockWindowAura(); 18 return new LockWindowAura();
17 } 19 }
18 20
19 //////////////////////////////////////////////////////////////////////////////// 21 ////////////////////////////////////////////////////////////////////////////////
(...skipping 15 matching lines...) Expand all
35 Init(); 37 Init();
36 } 38 }
37 39
38 LockWindowAura::~LockWindowAura() { 40 LockWindowAura::~LockWindowAura() {
39 } 41 }
40 42
41 void LockWindowAura::Init() { 43 void LockWindowAura::Init() {
42 views::Widget::InitParams params( 44 views::Widget::InitParams params(
43 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); 45 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
44 params.show_state = ui::SHOW_STATE_FULLSCREEN; 46 params.show_state = ui::SHOW_STATE_FULLSCREEN;
47 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe))
48 params.transparent = true;
45 // TODO(oshima): move the lock screen harness to ash. 49 // TODO(oshima): move the lock screen harness to ash.
46 params.parent = 50 params.parent =
47 ash::Shell::GetContainer( 51 ash::Shell::GetContainer(
48 ash::Shell::GetPrimaryRootWindow(), 52 ash::Shell::GetPrimaryRootWindow(),
49 ash::internal::kShellWindowId_LockScreenContainer); 53 ash::internal::kShellWindowId_LockScreenContainer);
50 views::Widget::Init(params); 54 views::Widget::Init(params);
51 ash::SetWindowVisibilityAnimationTransition(GetNativeView(), 55 ash::SetWindowVisibilityAnimationTransition(GetNativeView(),
52 ash::ANIMATE_NONE); 56 ash::ANIMATE_NONE);
53 } 57 }
54 58
55 } // namespace chromeos 59 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/wm/root_window_layout_manager.cc ('k') | chrome/browser/chromeos/login/screen_locker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698