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

ash/launcher/launcher_view.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/launcher/launcher_view.h"
 
 #include "ash/launcher/app_launcher_button.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_window_cycler.h"
 #include "ash/launcher/tabbed_launcher_button.h"
 #include "ash/launcher/view_model.h"
 #include "ash/launcher/view_model_utils.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/window.h"
 #include "ui/base/animation/animation.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
+#include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/widget.h"
 
 using ui::Animation;
 using views::View;
 
 namespace ash {
 namespace internal {
 
 // Amount content is inset on the left edge.
 static const int kLeadingInset = 8;
@@ skipping 143 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(StartFadeAnimationDelegate);
 };
 
 LauncherView::LauncherView(LauncherModel* model)
     : model_(model),
       view_model_(new ViewModel),
       overflow_button_(NULL),
       dragging_(NULL),
       drag_view_(NULL),
       drag_offset_(0),
-      start_drag_index_(-1) {
+      start_drag_index_(-1),
+      ctrl_forward_key_(ui::VKEY_F2, false, true, false),
+      ctrl_back_key_(ui::VKEY_F1, false, true, false) {
   DCHECK(model_);
   bounds_animator_.reset(new views::BoundsAnimator(this));
+  AddAccelerator(ctrl_forward_key_);
+  AddAccelerator(ctrl_back_key_);
 }
 
 LauncherView::~LauncherView() {
   model_->RemoveObserver(this);
 }
 
 void LauncherView::Init() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   model_->AddObserver(this);
 
@@ skipping 282 matching lines @@
     return gfx::Size(view_model_->ideal_bounds(1).right() + kLeadingInset,
                      kPreferredHeight);
   }
   return gfx::Size(kButtonWidth * 2 + kLeadingInset * 2, kPreferredHeight);
 }
 
 void LauncherView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   LayoutToIdealBounds();
 }
 
+bool LauncherView::AcceleratorPressed(const ui::Accelerator& accelerator) {
+  views::FocusManager* focus_manager = GetFocusManager();
+  const views::View* focused_view = focus_manager->GetFocusedView();
+  if (!Contains(focused_view))
+    return false;
+
+  ShellDelegate* delegate = Shell::GetInstance()->delegate();
+  if (!delegate)
+    return false;
+
+  switch (accelerator.key_code()) {
+    case ui::VKEY_F1:
+      delegate->RotateFocus(true);
+      return true;
+    case ui::VKEY_F2:
+      delegate->RotateFocus(false);
+      return true;
+    default:
+      return false;
+  }
+}
+
 void LauncherView::LauncherItemAdded(int model_index) {
   CancelDrag(NULL);
 
   views::View* view = CreateViewForItem(model_->items()[model_index]);
   AddChildView(view);
   // Hide the view, it'll be made visible when the animation is done.
   view->SetVisible(false);
   view_model_->Add(view, model_index);
 
   // The first animation moves all the views to their target position. |view| is
@@ skipping 132 matching lines @@
       cycler_->Cycle();
       break;
 
     default:
       NOTREACHED();
   }
 }
 
 }  // namespace internal
 }  // namespace ash