UI polish for certificate viewer

chrome/browser/chromeos/frame/bubble_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/chromeos/frame/bubble_frame_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/frame/bubble_window.h"
@@ skipping 125 matching lines @@
 void BubbleFrameView::EnableClose(bool enable) {
 }
 
 void BubbleFrameView::ResetWindowControls() {
 }
 
 void BubbleFrameView::UpdateWindowIcon() {
 }
 
 gfx::Insets BubbleFrameView::GetInsets() const {
-  return (style_ & STYLE_FLUSH) ?
+  return (style_ & STYLE_FLUSH || style_ & STYLE_FLUSH_CONTENT) ?
          gfx::Insets() :
          gfx::Insets(kTitleTopPadding,
                      kHorizontalPadding,
                      0,
                      kHorizontalPadding);
 }
 
 gfx::Size BubbleFrameView::GetPreferredSize() {
   gfx::Size pref = frame_->client_view()->GetPreferredSize();
   gfx::Rect bounds(0, 0, pref.width(), pref.height());
   return frame_->non_client_view()->GetWindowBoundsForClientBounds(
       bounds).size();
 }
 
 void BubbleFrameView::Layout() {
   gfx::Insets insets = GetInsets();
 
   gfx::Size title_size;
   if (title_)
     title_size = title_->GetPreferredSize();
   gfx::Size close_button_size;
   if (close_button_)
     close_button_size = close_button_->GetPreferredSize();
   gfx::Size throbber_size;
   if (throbber_)
     throbber_size = throbber_->GetPreferredSize();
 
+  // Need to center elements which are shorter.
+  int max_height = std::max(title_size.height(),
+                            std::max(close_button_size.height(),
+                                     throbber_size.height()));
+
+  gfx::Insets title_insets = gfx::Insets();
+  // Need to insert title padding for STYLE_FLUSH_CONTENT.
+  if (style_ & STYLE_FLUSH_CONTENT)
+    title_insets = gfx::Insets(kTitleTopPadding,
+                               kHorizontalPadding,
+                               0,
+                               kHorizontalPadding);
+
   if (title_) {
     title_->SetBounds(
-        insets.left(), insets.top(),
-        std::max(0, width() - insets.width() - close_button_size.width()),
+        insets.left() + title_insets.left(),
+        insets.top() + title_insets.top() +
+            (max_height - title_size.height())/2, // Center.
+        std::max(0, width() - insets.width() - title_insets.width() -
+            close_button_size.width()),
         title_size.height());
   }
 
   if (close_button_) {
     close_button_->SetBounds(
-        width() - insets.right() - close_button_size.width(), insets.top(),
-        close_button_size.width(), close_button_size.height());
+        width() - insets.right() - title_insets.right() -
+            close_button_size.width(),
+        insets.top() + title_insets.top() +
+            (max_height - close_button_size.height())/2,
+        close_button_size.width(),
+        close_button_size.height());
   }
 
   if (throbber_) {
     throbber_->SetBounds(
-        insets.left(), insets.top(),
+        insets.left() + title_insets.left(),
+        insets.top() + title_insets.top() +
+            (max_height - throbber_size.height())/2,
         std::min(throbber_size.width(), width()),
         throbber_size.height());
   }
 
-  int top_height = insets.top();
+  int top_height = insets.top() + title_insets.top();
   if (title_size.height() > 0 ||
       close_button_size.height() > 0 ||
       throbber_size.height() > 0) {
     top_height += kTitleContentPadding + std::max(
         std::max(title_size.height(), close_button_size.height()),
         throbber_size.height());
   }
   client_view_bounds_.SetRect(insets.left(), top_height,
       std::max(0, width() - insets.width()),
       std::max(0, height() - top_height - insets.bottom()));
@@ skipping 12 matching lines @@
   canvas->GetSkCanvas()->drawPath(path, paint);
 }
 
 void BubbleFrameView::ButtonPressed(views::Button* sender,
                                     const views::Event& event) {
   if (close_button_ != NULL && sender == close_button_)
     frame_->Close();
 }
 
 }  // namespace chromeos