Mac Panels interaction with Dock modifications. (step 1)

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/bind.h"
 #include "base/logging.h"
@@ skipping 24 matching lines @@
 const double kPanelMaxWidthFactor = 0.35;
 const double kPanelMaxHeightFactor = 0.5;
 
 // Occasionally some system, like Windows, might not bring up or down the bottom
 // bar when the mouse enters or leaves the bottom screen area. This is the
 // maximum time we will wait for the bottom bar visibility change notification.
 // After the time expires, we bring up/down the titlebars as planned.
 const int kMaxMillisecondsWaitForBottomBarVisibilityChange = 1000;
 
 // See usage below.
-#if defined(OS_MACOSX)
-const int kMillisecondsBeforeCollapsingFromTitleOnlyState = 3000;
-#elif defined(TOOLKIT_GTK)
+#if defined(TOOLKIT_GTK)
 const int kMillisecondsBeforeCollapsingFromTitleOnlyState = 2000;
 #else
 const int kMillisecondsBeforeCollapsingFromTitleOnlyState = 0;
 #endif
 }  // namespace
 
 // static
 PanelManager* PanelManager::GetInstance() {
   static base::LazyInstance<PanelManager> instance = LAZY_INSTANCE_INITIALIZER;
   return instance.Pointer();
@@ skipping 16 matching lines @@
 
 PanelManager::~PanelManager() {
   DCHECK(panels_.empty());
   DCHECK(panels_pending_to_remove_.empty());
   DCHECK_EQ(0, minimized_panel_count_);
 }
 
 void PanelManager::OnDisplayChanged() {
   scoped_ptr<WindowSizer::MonitorInfoProvider> info_provider(
       WindowSizer::CreateDefaultMonitorInfoProvider());
-  SetWorkArea(info_provider->GetPrimaryMonitorWorkArea());
+#if defined(OS_MACOSX)
+  // On OSX, panels should be dropped all the way to the bottom edge of the
+  // screen (and overlap Dock).
+  gfx::Rect work_area = info_provider->GetPrimaryMonitorBounds();
+#else
+  gfx::Rect work_area = info_provider->GetPrimaryMonitorWorkArea();
+#endif
+  SetWorkArea(work_area);
 }
 
 void PanelManager::SetWorkArea(const gfx::Rect& work_area) {
   if (work_area == work_area_)
     return;
   work_area_ = work_area;
 
   auto_hiding_desktop_bar_->UpdateWorkArea(work_area_);
   AdjustWorkAreaForAutoHidingDesktopBars();
 
@@ skipping 437 matching lines @@
   }
   if (auto_hiding_desktop_bar_->IsEnabled(AutoHidingDesktopBar::ALIGN_RIGHT)) {
     int space = auto_hiding_desktop_bar_->GetThickness(
         AutoHidingDesktopBar::ALIGN_RIGHT);
     adjusted_work_area_.set_width(adjusted_work_area_.width() - space);
   }
 }
 
 int PanelManager::GetBottomPositionForExpansionState(
     Panel::ExpansionState expansion_state) const {
+  int bottom = adjusted_work_area_.bottom();
   // If there is an auto-hiding desktop bar aligned to the bottom edge, we need
   // to move the minimize panel down to the bottom edge.
-  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::GetNextBrowserWindowToActivate(
@@ skipping 60 matching lines @@
 
   // Start from the bottom to avoid reshuffling.
   for (Panels::reverse_iterator iter = panels_copy.rbegin();
        iter != panels_copy.rend(); ++iter)
     (*iter)->Close();
 }
 
 bool PanelManager::is_dragging_panel() const {
   return dragging_panel_index_ != kInvalidPanelIndex;
 }