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

Unified Diff: ash/wm/activation_controller.cc

Issue 9596002: ash uber tray: Make it work in ash_shell, and a couple more fixes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 10 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/system/tray/system_tray.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/activation_controller.cc
diff --git a/ash/wm/activation_controller.cc b/ash/wm/activation_controller.cc
index c90846ad5a5aa24b3709d03d8936c39075a0e262..052d407d190a0a3edf32ef455d34bcf25c81a10a 100644
--- a/ash/wm/activation_controller.cc
+++ b/ash/wm/activation_controller.cc
@@ -35,7 +35,8 @@ bool SupportsChildActivation(aura::Window* window) {
window->id() == kShellWindowId_StatusContainer ||
window->id() == kShellWindowId_LauncherContainer ||
window->id() == kShellWindowId_LockScreenContainer ||
- window->id() == kShellWindowId_LockSystemModalContainer;
+ window->id() == kShellWindowId_LockSystemModalContainer ||
+ window->id() == kShellWindowId_SettingBubbleContainer;
}
// Returns true if |window| can be activated or deactivated.
« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698