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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/stacking_controller.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
« no previous file with comments | « ash/wm/activation_controller.cc ('k') | ash/wm/window_cycle_controller_unittest.cc » ('j') | chrome/browser/chromeos/login/base_login_display_host.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/stacking_controller.cc
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
index 08a990b53296eeb86bbbb02f1282dd2a31124848..312017aeceaa13a810f127031ea33f9fa3ef6c52 100644
--- a/ash/wm/stacking_controller.cc
+++ b/ash/wm/stacking_controller.cc
@@ -45,6 +45,8 @@ StackingController::~StackingController() {
// StackingController, aura::StackingClient implementation:
aura::Window* StackingController::GetDefaultParent(aura::Window* window) {
+ if (window->stops_event_propagation())
+ return GetContainer(internal::kShellWindowId_LockScreenContainer);
switch (window->type()) {
case aura::client::WINDOW_TYPE_NORMAL:
case aura::client::WINDOW_TYPE_POPUP:
« no previous file with comments | « ash/wm/activation_controller.cc ('k') | ash/wm/window_cycle_controller_unittest.cc » ('j') | chrome/browser/chromeos/login/base_login_display_host.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698