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

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

Issue 9181012: Don't activate a window if screen is locked. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 11 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
diff --git a/chrome/browser/chromeos/login/lock_window_aura.cc b/chrome/browser/chromeos/login/lock_window_aura.cc
index 4fc118867778a40ae4adc72dee1d333d0709c477..2cbd850241412e75ea3644eb16912b6f9cba79f7 100644
--- a/chrome/browser/chromeos/login/lock_window_aura.cc
+++ b/chrome/browser/chromeos/login/lock_window_aura.cc
@@ -42,11 +42,9 @@ void LockWindowAura::Init() {
views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
params.bounds = gfx::Rect(aura::RootWindow::GetInstance()->GetHostSize());
views::Widget::Init(params);
- // TODO(flackr): Use a property to specify this container rather than
- // depending on shell implementation.
- ash::Shell::GetInstance()->GetContainer(
- ash::internal::kShellWindowId_LockScreenContainer)->
- AddChild(GetNativeView());
+ GetNativeView()->set_stops_event_propagation(true);
+ // Let the shell pick the container.
+ GetNativeView()->SetParent(NULL);
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698