Allow focus to be sent between browser window and launcher/status window

ash/shell.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/shell.h"
 
 #include <algorithm>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_filter.h"
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
 #include "ash/drag_drop/drag_drop_controller.h"
+#include "ash/focus_cycler.h"
 #include "ash/ime/input_method_event_filter.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/tooltips/tooltip_controller.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/compact_layout_manager.h"
 #include "ash/wm/compact_status_area_layout_manager.h"
 #include "ash/wm/dialog_frame_view.h"
@@ skipping 266 matching lines @@
   launcher_.reset(new Launcher(default_container));
 
   if (IsWindowModeCompact())
     SetupCompactWindowMode();
   else
     SetupNormalWindowMode();
 
   if (!command_line->HasSwitch(switches::kAuraNoShadows))
     shadow_controller_.reset(new internal::ShadowController());
 
+  focus_cycler_.reset(new internal::FocusCycler());
+  focus_cycler_->AddWidget(status_widget_);
+  if (!IsWindowModeCompact())

[sky, 2012/02/03 15:53:22]

The window mode can be changed at runtime. See ChangeWindowMOde.

[Zachary Kuznia, 2012/02/06 05:48:09]

Fixed to always add the launcher, and skip over it when it's hidden.

+    focus_cycler_->AddWidget(launcher_->widget());
+
   // Force a layout.
   root_window->layout_manager()->OnWindowResized();
 
   window_modality_controller_.reset(new internal::WindowModalityController);
   AddRootWindowEventFilter(window_modality_controller_.get());
 
   visibility_controller_.reset(new internal::VisibilityController);
   aura::client::SetVisibilityClient(visibility_controller_.get());
 
   accelerator_filter_.reset(new internal::AcceleratorFilter);
@@ skipping 101 matching lines @@
 
 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView(
     views::Widget* widget) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kAuraGoogleDialogFrames)) {
     return new internal::DialogFrameView;
   }
   return NULL;
 }
 
+void Shell::RotateFocus(Direction direction) {
+  focus_cycler_->RotateFocus(
+      direction == FORWARD ? internal::FocusCycler::FORWARD :
+                             internal::FocusCycler::BACKWARD);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, private:
 
 // Compact mode has a simplified layout manager and doesn't use the shelf,
 // desktop background, etc.  The launcher still exists so we can use its
 // data model and list of open windows, but we hide the UI to save space.
 void Shell::SetupCompactWindowMode() {
   DCHECK(root_window_layout_);
   DCHECK(status_widget_);
 
@@ skipping 80 matching lines @@
 
   // Create the desktop background image.
   root_window_layout_->SetBackgroundWidget(internal::CreateDesktopBackground());
 }
 
 void Shell::ResetLayoutManager(int container_id) {
   GetContainer(container_id)->SetLayoutManager(NULL);
 }
 
 }  // namespace ash