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

chrome/browser/chromeos/status/status_area_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 "chrome/browser/chromeos/status/status_area_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/border.h"
 
 #if defined(USE_AURA)
+#include "ash/launcher/launcher.h"
+#include "ash/shell.h"
 #include "ui/views/widget/widget.h"
 #endif
 
 // Number of pixels to separate each icon.
 const int kSeparation = 0;
 
 StatusAreaView::StatusAreaView()
-    : need_return_focus_(false) {
+    : need_return_focus_(false),
+      ctrl_forward_key_(ui::VKEY_F2, false, true, false),
+      ctrl_back_key_(ui::VKEY_F1, false, true, false) {
   set_id(VIEW_ID_STATUS_AREA);
+#if defined(USE_AURA)
+  AddAccelerator(ctrl_forward_key_);
+  AddAccelerator(ctrl_back_key_);
+#endif
 }
 
 StatusAreaView::~StatusAreaView() {
 }
 
 void StatusAreaView::AddButton(StatusAreaButton* button, bool bordered) {
   buttons_.push_back(button);
   if (bordered)
     button->set_border(views::Border::CreateEmptyBorder(0, 1, 0, 0));
   AddChildView(button);
@@ skipping 59 matching lines @@
 }
 
 void StatusAreaView::ChildPreferredSizeChanged(View* child) {
   // When something like the clock menu button's size changes, we need to
   // relayout. Also mark that this view's size has changed. This will let
   // BrowserView know to relayout, which will reset the bounds of this view.
   Layout();
   PreferredSizeChanged();
 }
 
+bool StatusAreaView::AcceleratorPressed(const ui::Accelerator& accelerator) {
+#if defined(USE_AURA)
+  bool focus_launcher = false;
+  switch (accelerator.key_code()) {
+    case ui::VKEY_F1:
+      focus_launcher = !ash::Shell::GetInstance()->IsWindowModeCompact();
+      break;
+
+    case ui::VKEY_F2:
+      // Focus Browser.
+      break;
+
+    default:
+      return false;
+  }
+
+  if (focus_launcher) {
+    if (ash::Shell::GetInstance()->launcher()->Activate()) {
+      return true;
+    }
+    // If we couldn't focus the launcher, fall through and focus the browser.
+  }
+  // TODO: Focus Browser
+
+  return true;
+#else
+  return false;
+#endif
+}
+
 void StatusAreaView::MakeButtonsActive(bool active) {
   for (std::list<StatusAreaButton*>::iterator iter = buttons_.begin();
        iter != buttons_.end(); ++iter) {
     (*iter)->SetMenuActive(active);
   }
 }
 
 void StatusAreaView::UpdateButtonVisibility() {
   Layout();
   PreferredSizeChanged();
@@ skipping 38 matching lines @@
   if (need_return_focus_) {
     const views::View* first = GetFirstFocusableChild();
     const views::View* last = GetLastFocusableChild();
     const bool first_to_last = (focused_before == first && focused_now == last);
     const bool last_to_first = (focused_now == first && focused_before == last);
 
     if (first_to_last || last_to_first)
       ReturnFocus(first_to_last);
   }
 }