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

chrome/browser/ui/views/frame/browser_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/ui/views/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 91 matching lines @@
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
 #if defined(USE_AURA)
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
+#include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/ui/views/accelerator_table.h"
 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
 #include "chrome/browser/ui/views/aura/launcher_icon_updater.h"
 #include "ui/gfx/screen.h"
 #elif defined(OS_WIN)
 #include "chrome/browser/aeropeek_manager.h"
 #include "chrome/browser/jumplist_win.h"
 #include "ui/base/message_box_win.h"
 #include "ui/views/widget/native_widget_win.h"
 #elif defined(TOOLKIT_USES_GTK)
@@ skipping 835 matching lines @@
   // Get a vector of all panes in the order we want them to be focused,
   // with NULL to represent the tab contents getting focus. If one of these
   // is currently invisible or has no focusable children it will be
   // automatically skipped.
   std::vector<views::AccessiblePaneView*> accessible_panes;
   GetAccessiblePanes(&accessible_panes);
   int pane_count = static_cast<int>(accessible_panes.size());
 
   std::vector<views::View*> accessible_views(
       accessible_panes.begin(), accessible_panes.end());
+
   accessible_views.push_back(GetTabContentsContainerView());
   if (devtools_container_->visible())
     accessible_views.push_back(devtools_container_->GetFocusView());
+
   int count = static_cast<int>(accessible_views.size());
 
   // Figure out which view (if any) currently has the focus.
   const views::View* focused_view = GetFocusManager()->GetFocusedView();
   int index = -1;
   if (focused_view) {
     for (int i = 0; i < count; ++i) {
       if (accessible_views[i] == focused_view ||
           accessible_views[i]->Contains(focused_view)) {
         index = i;
         break;
       }
     }
   }
 
   // If the focus isn't currently in a pane, save the focus so we
   // can restore it if the user presses Escape.
   if (focused_view && index >= pane_count)
     GetFocusManager()->StoreFocusedView();
 
+  // Add the special panes to the rotation.
+  int normal_count = count;
+
+#if defined(OS_CHROMEOS) && defined(USE_AURA)
+  int status_area_index = count;
+  ++count;
+
+  int launcher_index = -1;
+  if (!ash::Shell::GetInstance()->IsWindowModeCompact()) {
+    // Add the launcher if not in compact mode.
+    launcher_index = count;
+    ++count;
+  }
+#endif
+
   // Try to focus the next pane; if SetPaneFocusAndFocusDefault returns
   // false it means the pane didn't have any focusable controls, so skip
   // it and try the next one.
   for (;;) {
     if (forwards)
       index = (index + 1) % count;
     else
       index = ((index - 1) + count) % count;
 
-    if (index < pane_count) {
+    if (index >= normal_count) {
+#if defined(OS_CHROMEOS) && defined(USE_AURA)
+      if (index == status_area_index) {
+        StatusAreaView* status_area =
+            ChromeShellDelegate::instance()->GetStatusArea();
+        if (status_area->SetPaneFocusAndFocusDefault()) {
+          status_area->GetWidget()->Activate();
+          break;
+        }
+      } else if (index == launcher_index) {
+        if (ash::Shell::GetInstance()->launcher()->Activate()) {
+          break;
+        }
+      }
+#endif
+    } else if (index < pane_count) {
       if (accessible_panes[index]->SetPaneFocusAndFocusDefault())
         break;
     } else {
       accessible_views[index]->RequestFocus();
       break;
     }
   }
 }
 
 void BrowserView::DestroyBrowser() {
@@ skipping 1549 matching lines @@
   browser::CreateViewsBubble(bubble);
   bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
   bubble->Show();
 }
 
 void BrowserView::ShowAvatarBubbleFromAvatarButton() {
   AvatarMenuButton* button = frame_->GetAvatarMenuButton();
   if (button)
     button->ShowAvatarBubble();
 }