Activate the status area only when it's focused using the keyboard

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/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_modality_controller.h"
 #include "ash/wm/window_util.h"
 #include "base/auto_reset.h"
+#include "base/command_line.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/window_types.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/ui_base_types.h"
 
 namespace ash {
 namespace internal {
 namespace {
 
@@ skipping 171 matching lines @@
 // ActivationController, aura::RootWindowObserver implementation:
 
 void ActivationController::OnWindowFocused(aura::Window* window) {
   ActivateWindow(GetActivatableWindow(window));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ActivationController, private:
 
 void ActivationController::ActivateNextWindow(aura::Window* window) {
-  if (wm::IsActiveWindow(window))
+  if (wm::IsActiveWindow(window) ||
+      // TODO(yusukes): Remove the code when uber tray becomes the default.
+      (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshUberTray) &&
+       window && window->type() == aura::client::WINDOW_TYPE_MENU)) {

[sadrul, 2012/03/02 10:17:01]

I wonder if you can just use 

if (window && window->type() != aura::client::WINDOW_TYPE_NORMAL)

(and maybe exclude TOOLTIP too)

If so, then you won't need the changes in system_tray

[Yusuke Sato, 2012/03/02 11:51:09]

To handle the uber tray here, I tried this:

window && window->type() == aura::client::WINDOW_TYPE_MENU ||
window && window->type() == aura::client::WINDOW_TYPE_POPUP

but it didn't work because when the uber tray (volume) icon in the status area
is clicked to hide the tray bubble, the status area itself is immediately
activated before this function is called via
OnWindowVisibilityChanged(the_bubble, false). So I guess we have to modify the
system tray code anyway.



On 2012/03/02 10:17:01, sadrul wrote:

     ActivateWindow(GetTopmostWindowToActivate(window));
+  }
 }
 
 aura::Window* ActivationController::GetTopmostWindowToActivate(
     aura::Window* ignore) const {
   const aura::Window* container =
       default_container_for_test_ ? default_container_for_test_ :
           GetContainer(kShellWindowId_DefaultContainer);
   // When destructing an active window that is in a container destructed after
   // the default container during shell shutdown, |container| would be NULL
   // because default container is destructed at this point.
   if (container) {
     for (aura::Window::Windows::const_reverse_iterator i =
              container->children().rbegin();
          i != container->children().rend();
          ++i) {
       if (*i != ignore && CanActivateWindow(*i))
         return *i;
     }
   }
   return NULL;
 }
 
 }  // namespace internal
 }  // namespace ash