ash uber tray: Make it work in ash_shell, and a couple more fixes.

ash/wm/activation_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/activation_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_modality_controller.h"
 #include "ash/wm/window_util.h"
@@ skipping 17 matching lines @@
 // Returns true if children of |window| can be activated.
 // These are the only containers in which windows can receive focus.
 bool SupportsChildActivation(aura::Window* window) {
   return window->id() == kShellWindowId_DefaultContainer ||
          window->id() == kShellWindowId_AlwaysOnTopContainer ||
          window->id() == kShellWindowId_PanelContainer ||
          window->id() == kShellWindowId_SystemModalContainer ||
          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.
 // A window manager typically defines some notion of "top level window" that
 // supports activation/deactivation.
 bool CanActivateWindow(aura::Window* window) {
   return window &&
       window->IsVisible() &&
       (!aura::client::GetActivationDelegate(window) ||
         aura::client::GetActivationDelegate(window)->ShouldActivate(NULL)) &&
@@ skipping 172 matching lines @@
          ++i) {
       if (*i != ignore && CanActivateWindow(*i))
         return *i;
     }
   }
   return NULL;
 }
 
 }  // namespace internal
 }  // namespace ash