Support painting panel in iconified mode on Windows.

chrome/browser/ui/panels/panel_browser_frame_view.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_browser_frame_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/themes/theme_service.h"
@@ skipping 450 matching lines @@
 }
 
 gfx::Size PanelBrowserFrameView::GetMinimumSize() {
   // This makes the panel be able to shrink to very small, like 4-pixel lines.
   // Since the panel cannot be resized by the user, we do not need to enforce
   // the minimum size.
   return gfx::Size();
 }
 
 void PanelBrowserFrameView::Layout() {
+  // Check if the width is only enough to show only the icon, or both icon
+  // and title. Hide corresponding controls accordingly.
+  bool show_close_button = true;
+  bool show_settings_button = true;
+  bool show_title_label = true;
+  if (width() <= IconOnlyWidth()) {

[Dmitry Titov, 2011/12/01 02:28:11]

Seems both branches of this if are intended for OVERFLOW, so why not:
if (IN_OVERFLOW) {
  if (small width)
    ...
   else
    ...
}

+    show_close_button = false;
+    show_settings_button = false;
+    show_title_label = false;
+  } else if (panel_browser_view_->panel()->expansion_state() ==
+             Panel::IN_OVERFLOW) {
+    show_close_button = true;

[prasadt, 2011/12/01 04:04:46]

This is already true.

+    show_settings_button = false;
+  }
+  close_button_->SetVisible(show_close_button);
+  settings_button_->SetVisible(show_settings_button);
+  title_label_->SetVisible(show_title_label);
+  if (!show_title_label)
+    return;

[prasadt, 2011/12/01 04:04:46]

A comment why you return here?

+
   // Cancel the settings button animation if the layout of titlebar is being
   // updated.
   if (settings_button_animator_.get() && settings_button_animator_->IsShowing())
     settings_button_animator_->Reset();
 
   // Layout the close button.
-  gfx::Size close_button_size = close_button_->GetPreferredSize();
-  close_button_->SetBounds(
-      width() - kBorderThickness - kCloseButtonAndBorderSpacing -
-          close_button_size.width(),
-      (NonClientTopBorderHeight() - close_button_size.height()) / 2,
-      close_button_size.width(),
-      close_button_size.height());
+  int right = width();
+  if (show_close_button) {
+    gfx::Size close_button_size = close_button_->GetPreferredSize();
+    close_button_->SetBounds(
+        width() - kBorderThickness - kCloseButtonAndBorderSpacing -
+            close_button_size.width(),
+        (NonClientTopBorderHeight() - close_button_size.height()) / 2,
+        close_button_size.width(),
+        close_button_size.height());
 
-  // Layout the settings button.
-  gfx::Size settings_button_size = settings_button_->GetPreferredSize();
-  settings_button_->SetBounds(
-      close_button_->x() - kSettingsButtonAndCloseButtonSpacing -
+    // Layout the settings button.
+    if (show_settings_button) {
+      gfx::Size settings_button_size = settings_button_->GetPreferredSize();
+      settings_button_->SetBounds(
+          close_button_->x() - kSettingsButtonAndCloseButtonSpacing -
+              settings_button_size.width(),
+          (NonClientTopBorderHeight() - settings_button_size.height()) / 2,
           settings_button_size.width(),
-      (NonClientTopBorderHeight() - settings_button_size.height()) / 2,
-      settings_button_size.width(),
-      settings_button_size.height());
+          settings_button_size.height());
 
-  // Trace the full bounds and zero-size bounds for animation purpose.
-  settings_button_full_bounds_ = settings_button_->bounds();
-  settings_button_zero_bounds_.SetRect(
-      settings_button_full_bounds_.x() +
-          settings_button_full_bounds_.width() / 2,
-      settings_button_full_bounds_.y() +
-          settings_button_full_bounds_.height() / 2,
-      0,
-      0);
+      // Trace the full bounds and zero-size bounds for animation purpose.
+      settings_button_full_bounds_ = settings_button_->bounds();
+      settings_button_zero_bounds_.SetRect(
+          settings_button_full_bounds_.x() +
+              settings_button_full_bounds_.width() / 2,
+          settings_button_full_bounds_.y() +
+              settings_button_full_bounds_.height() / 2,
+          0,
+          0);
+    }
+  }
 
   // Layout the icon.
   int icon_y = (NonClientTopBorderHeight() - kIconSize) / 2;
   title_icon_->SetBounds(
       kBorderThickness + kIconAndBorderSpacing,
       icon_y,
       kIconSize,
       kIconSize);
 
   // Layout the title.
   int title_x = title_icon_->bounds().right() + kTitleSpacing;
   int title_height = BrowserFrame::GetTitleFont().GetHeight();
   title_label_->SetBounds(
       title_x,
       icon_y + ((kIconSize - title_height - 1) / 2),
-      std::max(0, settings_button_->x() - kTitleSpacing - title_x),
+      std::max(0, right - kTitleSpacing - title_x),
       title_height);
 
   // Calculate the client area bounds.
   int top_height = NonClientTopBorderHeight();
   int border_thickness = NonClientBorderThickness();
   client_view_bounds_.SetRect(
       border_thickness,
       top_height,
       std::max(0, width() - (2 * border_thickness)),
       std::max(0, height() - top_height - border_thickness));
@@ skipping 93 matching lines @@
 
 int PanelBrowserFrameView::NonClientTopBorderHeight() const {
   return kBorderThickness + kTitlebarHeight + kPanelClientEdgeThickness;
 }
 
 gfx::Size PanelBrowserFrameView::NonClientAreaSize() const {
   return gfx::Size(NonClientBorderThickness() * 2,
                    NonClientTopBorderHeight() + NonClientBorderThickness());
 }
 
+int PanelBrowserFrameView::IconOnlyWidth() const {
+  return kBorderThickness * 2 + kIconAndBorderSpacing * 2 + kIconSize;
+}
+
+gfx::Size PanelBrowserFrameView::IconifiedSize() const {
+  return gfx::Size(IconOnlyWidth(), NonClientTopBorderHeight());
+}
+
 bool PanelBrowserFrameView::UsingDefaultTheme() const {
   ThemeService* theme_service = ThemeServiceFactory::GetForProfile(
       panel_browser_view_->panel()->browser()->profile());
   return theme_service->UsingDefaultTheme();
 }
 
 SkColor PanelBrowserFrameView::GetDefaultTitleColor(
     PaintState paint_state) const {
   switch (paint_state) {
     case PAINT_AS_INACTIVE:
@@ skipping 143 matching lines @@
 void PanelBrowserFrameView::OnMouseEnterOrLeaveWindow(bool mouse_entered) {
   // Panel might be closed when we still watch the mouse event.
   if (!panel_browser_view_->panel())
     return;
   UpdateSettingsButtonVisibility(panel_browser_view_->focused(),
                                  mouse_entered);
 }
 
 void PanelBrowserFrameView::UpdateSettingsButtonVisibility(
     bool focused, bool cursor_in_view) {
+  // The settings button is not shown in the overflow state.
+  if (panel_browser_view_->panel()->expansion_state() == Panel::IN_OVERFLOW)

[prasadt, 2011/12/01 04:04:46]

Assert is_settings_button_visible_ is false?

+    return;
+
   bool is_settings_button_visible = focused || cursor_in_view;
   if (is_settings_button_visible_ == is_settings_button_visible)
     return;
   is_settings_button_visible_ = is_settings_button_visible;
 
   // Even if we're hidng the settings button, we still make it visible for the
   // time period that the animation is running.
   settings_button_->SetVisible(true);
 
   if (settings_button_animator_.get()) {
@@ skipping 19 matching lines @@
 
   settings_menu_model_.reset(
       new PanelSettingsMenuModel(panel_browser_view_->panel()));
   settings_menu_adapter_.reset(
       new views::MenuModelAdapter(settings_menu_model_.get()));
   settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get());
   settings_menu_adapter_->BuildMenu(settings_menu_);
   settings_menu_runner_.reset(new views::MenuRunner(settings_menu_));
   return true;
 }