Choose the right window to switch to when a panel is deactivated on Windows.

chrome/browser/ui/panels/panel_manager.cc

 // Copyright (c) 2011 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/panels/panel_manager.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/window_sizer.h"
 
 namespace {
 // Invalid panel index.
 const size_t kInvalidPanelIndex = static_cast<size_t>(-1);
 
 // Default width and height of a panel.
 const int kPanelDefaultWidth = 240;
 const int kPanelDefaultHeight = 290;
 
@@ skipping 493 matching lines @@
   int bottom = adjusted_work_area_.bottom();
   if (expansion_state == Panel::MINIMIZED &&
       auto_hiding_desktop_bar_->IsEnabled(AutoHidingDesktopBar::ALIGN_BOTTOM)) {
     bottom += auto_hiding_desktop_bar_->GetThickness(
         AutoHidingDesktopBar::ALIGN_BOTTOM);
   }
 
   return bottom;
 }
 
+BrowserWindow* PanelManager::GetNextPanelToActivate(Panel* panel) const {

[jennb, 2011/10/07 20:34:16]

Why do we need to find the next panel within the same extension? Could keep it
simple and just iterate through begin_last_active() and find the first that
isn't minimized.

[jianli, 2011/10/07 22:01:54]

Per discussion, we changed to activate the last active browser window that is
not minimized.

+  // First, find a panel that satisfies the following criteria:
+  // 1) expanded
+  // 2) from the same extension
+  // 3) closer to the panel to be deactivated, if there're more than one panels
+  //    that meet 1 and 2
+  const Extension* extension = panel->GetExtension();
+  size_t panel_index;
+  for (panel_index = 0; panel_index < panels_.size(); ++panel_index) {
+    if (panels_[panel_index] == panel)
+      break;
+  }
+  DCHECK(panel_index < panels_.size());
+
+  size_t max_index_delta = std::max(panel_index, panels_.size() - panel_index);

[Dmitry Titov, 2011/10/07 20:29:15]

This needs a comment. Why this specific math? 

[jianli, 2011/10/07 22:01:54]

Not needed due to deactivation algorithm change.

+  for (size_t delta = 1; delta <= max_index_delta; ++delta) {
+    if (panel_index + delta < panels_.size()) {
+      Panel* next_panel = panels_[panel_index + delta];
+      if (next_panel->expansion_state() == Panel::EXPANDED &&
+          next_panel->GetExtension() == extension) {
+        return next_panel->browser()->window();
+      }
+    }
+
+    if (panel_index >= delta) {

[Dmitry Titov, 2011/10/07 20:29:15]

would be more readable as 'panel_index - delta >= 0' because it is a guard
against negative index.

[jianli, 2011/10/07 22:01:54]

Not needed due to deactivation algorithm change.

+      Panel* next_panel = panels_[panel_index - delta];
+      if (next_panel->expansion_state() == Panel::EXPANDED &&
+          next_panel->GetExtension() == extension) {
+        return next_panel->browser()->window();
+      }
+    }
+  }
+
+  // Then, find the last active tabbed window.
+  BrowserList::const_reverse_iterator iter = BrowserList::begin_last_active();
+  BrowserList::const_reverse_iterator end = BrowserList::end_last_active();
+  for (; (iter != end); ++iter) {
+    Browser* browser = *iter;
+    if (browser->is_type_tabbed())
+      return browser->window();
+  }
+
+  return NULL;
+}
+
 void PanelManager::OnMouseMove(const gfx::Point& mouse_position) {
   bool bring_up_titlebars = ShouldBringUpTitlebars(mouse_position.x(),
                                                    mouse_position.y());
   if (are_titlebars_up_ == bring_up_titlebars)
     return;
   are_titlebars_up_ = bring_up_titlebars;
   BringUpOrDownTitlebars(bring_up_titlebars);
 }
 
 void PanelManager::OnAutoHidingDesktopBarThicknessChanged() {
@@ skipping 61 matching lines @@
     Panel* panel = *iter;
     // A panel can at most grow to take over all the available space that is
     // returned by GetRightMostAvailablePosition.
     int width_can_grow_to =
         panel->GetBounds().width() + GetRightMostAvailablePosition();
     panel->SetMaxSize(gfx::Size(
         std::min(width_can_grow_to, GetMaxPanelWidth()),
         GetMaxPanelHeight()));
   }
 }