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

Unified Diff: ui/aura_shell/stacking_controller.h

Issue 8638013: [cros Aura] Added modal container for screen lock. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 9 years, 1 month 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: ui/aura_shell/stacking_controller.h
diff --git a/ui/aura_shell/stacking_controller.h b/ui/aura_shell/stacking_controller.h
index 20bb5feaf36531218be6c1c6065586466857d74c..7be9966f8610b2c849b16b6f1da053fa3308e90d 100644
--- a/ui/aura_shell/stacking_controller.h
+++ b/ui/aura_shell/stacking_controller.h
@@ -35,6 +35,13 @@ class StackingController : public aura::StackingClient {
aura::Window* ignore) const OVERRIDE;
private:
+ // Returns corresponding modal container for a modal window.
+ // If screen lock is not active, all modal windows are placed into the
+ // normal modal container.
+ // Otherwise those that originate from LockScreen container and above are
+ // placed in the screen lock modal container.
+ aura::Window* GetModalContainer(aura::Window* window) const;
+
scoped_ptr<internal::AlwaysOnTopController> always_on_top_controller_;
DISALLOW_COPY_AND_ASSIGN(StackingController);

Powered by Google App Engine
This is Rietveld 408576698