chrome/browser/chromeos/login/lock_window_aura.cc - Issue 10829173: Revert 149869 because it broke ash_unittests on win_aura and linux_chromeos.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/lock_window_aura.cc

Issue 10829173: Revert 149869 because it broke ash_unittests on win_aura and linux_chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/chromeos/login/lock_window_aura.cc

===================================================================

--- chrome/browser/chromeos/login/lock_window_aura.cc (revision 149877)

+++ chrome/browser/chromeos/login/lock_window_aura.cc (working copy)

@@ -7,8 +7,6 @@

#include "ash/shell.h"

#include "ash/shell_window_ids.h"

#include "ash/wm/window_animations.h"

-#include "base/command_line.h"

-#include "chrome/common/chrome_switches.h"

#include "ui/aura/root_window.h"

#include "ui/aura/window.h"

@@ -44,8 +42,6 @@

views::Widget::InitParams params(

views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);

params.show_state = ui::SHOW_STATE_FULLSCREEN;

- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe))

- params.transparent = true;

// TODO(oshima): move the lock screen harness to ash.

params.parent =

ash::Shell::GetContainer(

« 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 »