Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(681)

Unified Diff: chrome/browser/ui/panels/panel_manager.cc

Issue 8602007: Panels: Disable auto-resize if initial size is specified during creation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Set bottom right of panel correctly. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/panels/panel_manager.cc
diff --git a/chrome/browser/ui/panels/panel_manager.cc b/chrome/browser/ui/panels/panel_manager.cc
index b7669b3d4f05e7406ad9799f97d8a08ce83b648d..36ef7482b451015dd5f10c288714da8a75d22f3d 100644
--- a/chrome/browser/ui/panels/panel_manager.cc
+++ b/chrome/browser/ui/panels/panel_manager.cc
@@ -105,10 +105,13 @@ Panel* PanelManager::CreatePanel(Browser* browser) {
int width = browser->override_bounds().width();
int height = browser->override_bounds().height();
- if (width == 0 && height == 0) {
+ // Auto resizable is enabled only if no initial size is provided.
+ bool auto_resize = (width == 0 && height == 0);
+
+ if (width == 0)
width = kPanelDefaultWidth;
+ if (height == 0)
height = kPanelDefaultHeight;
- }
int max_panel_width = GetMaxPanelWidth();
int max_panel_height = GetMaxPanelHeight();
@@ -127,8 +130,11 @@ Panel* PanelManager::CreatePanel(Browser* browser) {
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(

Powered by Google App Engine
This is Rietveld 408576698