Migrate CollectedCookiesViews to Chrome style.

chrome/browser/ui/views/constrained_window_frame_simple.cc

 // Copyright (c) 2012 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/views/constrained_window_frame_simple.h"
 
 #include "chrome/browser/ui/constrained_window_constants.h"
 #include "chrome/browser/ui/constrained_window.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "grit/chromium_strings.h"
@@ skipping 10 matching lines @@
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/widget/widget.h"
 
 ConstrainedWindowFrameSimple::ConstrainedWindowFrameSimple(
     ConstrainedWindowViews* container,
-    ConstrainedWindowViews::ChromeStyleClientInsets client_insets)
+    ConstrainedWindowViews::ChromeStyleFrameLayout frame_layout)
     : container_(container),
-      client_insets_(client_insets),
+      frame_layout_(frame_layout),
       title_label_(NULL),
       close_button_(NULL),
       bottom_margin_(0) {
   container_->set_frame_type(views::Widget::FRAME_TYPE_FORCE_CUSTOM);
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   const SkColor stroke_color = SkColorSetRGB(0xaa, 0xaa, 0xaa);
   set_border(views::Border::CreateSolidBorder(1, stroke_color));
 #else
   set_border(views::Border::CreateEmptyBorder(0, 0, 0, 0));
 #endif
 
-  // The NO_INSETS consumers draw atop the frame and do not get the close button
-  // and title label below.
-  if (client_insets_ == ConstrainedWindowViews::NO_INSETS)
+  // The FRAME_LAYOUT_NONE consumers draw atop the frame and do not get the
+  // close button and title label below.
+  if (frame_layout_ == ConstrainedWindowViews::FRAME_LAYOUT_NONE)
     return;
 
   gfx::Insets border_insets = border()->GetInsets();
 
   views::GridLayout* layout = new views::GridLayout(this);
   const int kHeaderTopPadding = std::min(
       ConstrainedWindowConstants::kCloseButtonPadding,
       ConstrainedWindowConstants::kTitleTopPadding);
   layout->SetInsets(border_insets.top() + kHeaderTopPadding,
                     border_insets.left() +
@@ skipping 45 matching lines @@
 // - The client insets are the distance from the window border to the client
 //   view.
 // - The header insets are the distance from the window border to the header
 //   elements.
 gfx::Insets ConstrainedWindowFrameSimple::GetClientInsets() const {
   gfx::Insets insets;
 
   if (border())
     insets += border()->GetInsets();
 
-  if (client_insets_ == ConstrainedWindowViews::DEFAULT_INSETS) {
+  if (frame_layout_ == ConstrainedWindowViews::FRAME_LAYOUT_FULL ||
+      frame_layout_ == ConstrainedWindowViews::FRAME_LAYOUT_HEADER_ONLY) {
     const int kHeaderTopPadding = std::min(
         ConstrainedWindowConstants::kCloseButtonPadding,
         ConstrainedWindowConstants::kTitleTopPadding);
     const int kTitleBuiltinBottomPadding = 4;
+    const int kClientHorizontalPadding =
+        frame_layout_ == ConstrainedWindowViews::FRAME_LAYOUT_FULL ?
+        ConstrainedWindowConstants::kHorizontalPadding : 0;
+    const int kClientBottomPadding =
+        frame_layout_ == ConstrainedWindowViews::FRAME_LAYOUT_FULL ?
+        ConstrainedWindowConstants::kClientBottomPadding - bottom_margin_ : 0;
     insets += gfx::Insets(
         ConstrainedWindowConstants::kClientTopPadding + kHeaderTopPadding +
             std::max(close_button_->GetPreferredSize().height(),
                      title_label_->GetPreferredSize().height()) -
             kTitleBuiltinBottomPadding,
-        ConstrainedWindowConstants::kHorizontalPadding,
-        ConstrainedWindowConstants::kClientBottomPadding - bottom_margin_,
-        ConstrainedWindowConstants::kHorizontalPadding);
+        kClientHorizontalPadding,
+        kClientBottomPadding,
+        kClientHorizontalPadding);
   }
 
   return insets;
 }
 
 gfx::Rect ConstrainedWindowFrameSimple::GetBoundsForClientView() const {
   gfx::Rect contents_bounds(GetLocalBounds());
   gfx::Insets insets = GetClientInsets();
   contents_bounds.Inset(insets);
   return contents_bounds;
@@ skipping 52 matching lines @@
   return GetWindowBoundsForClientBounds(
       gfx::Rect(container_->client_view()->GetPreferredSize())).size();
 }
 
 void ConstrainedWindowFrameSimple::ButtonPressed(views::Button* sender,
                                                  const ui::Event& event) {
   DCHECK(close_button_);
   if (sender == close_button_)
     sender->GetWidget()->Close();
 }