Panels: Disable auto-resize if initial size is specified during creation.

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"
 #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"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 
 namespace {
 // Invalid panel index.
 const size_t kInvalidPanelIndex = static_cast<size_t>(-1);
 
 // Width of spacing between first panel and the right edge of the screen.
 // Leaving a larger gap at the edge of the screen allows access to UI
 // elements located on the bottom right of windows.
 const int kRightScreenEdgeSpacingWidth = 24;
 
-// Default width and height of a panel.
-const int kPanelDefaultWidth = 240;
-const int kPanelDefaultHeight = 290;
+// Width to height ratio is used to compute the default width or height
+// when only one value is provided.
+const double kPanelDefaultWidthToHeightRatio = 1.62;  // golden ratio
 
 // Maxmium width and height of a panel based on the factor of the working
 // area.
 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.
@@ skipping 56 matching lines @@
   AdjustWorkAreaForAutoHidingDesktopBars();
 
   Rearrange(panels_.begin(), StartingRightPosition());
 }
 
 Panel* PanelManager::CreatePanel(Browser* browser) {
   // Adjust the width and height to fit into our constraint.
   int width = browser->override_bounds().width();
   int height = browser->override_bounds().height();
 
-  if (width == 0 && height == 0) {
-    width = kPanelDefaultWidth;
-    height = kPanelDefaultHeight;
+  // Auto resizable is enabled only if no initial size is provided.
+  bool auto_resize = (width == 0 && height == 0);
+
+  if (!auto_resize) {
+    if (height == 0)
+      height = width / kPanelDefaultWidthToHeightRatio;
+    if (width == 0)
+      width = height * kPanelDefaultWidthToHeightRatio;
   }
 
   int max_panel_width = GetMaxPanelWidth();
   int max_panel_height = GetMaxPanelHeight();
 
   if (width < kPanelMinWidth)
     width = kPanelMinWidth;
   else if (width > max_panel_width)
     width = max_panel_width;
 
   if (height < kPanelMinHeight)
     height = kPanelMinHeight;
   else if (height > max_panel_height)
     height = max_panel_height;
 
   int y = adjusted_work_area_.bottom() - height;
   int x = GetRightMostAvailablePosition() - width;
 
   // Now create the panel with the computed bounds.
-  Panel* panel = new Panel(browser, gfx::Rect(x, y, width, height));
-  panel->SetMaxSize(gfx::Size(max_panel_width, max_panel_height));
+  Panel* panel = new Panel(browser,
+                           gfx::Rect(x, y, width, height),
+                           gfx::Size(kPanelMinWidth, kPanelMinHeight),
+                           gfx::Size(max_panel_width, max_panel_height),
+                           auto_resize);
   panels_.push_back(panel);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_ADDED,
       content::Source<Panel>(panel),
       content::NotificationService::NoDetails());
 
   return panel;
 }
 
@@ skipping 478 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;
 }