Fix various issues with popup/app window layout/drawing.

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc

 // Copyright 2013 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/frame/opaque_browser_frame_view_layout.h"
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/layout_constants.h"
@@ skipping 169 matching lines @@
 
   int CaptionLeft() const {
     return kWindowWidth -
         (delegate_->IsMaximized() ? kMaximizedExtraCloseWidth
                                   : OBFVL::kFrameBorderThickness) -
         kCaptionButtonsWidth - OBFVL::kCaptionSpacing;
   }
 
   int IconAndTitleY() const {
     // This approximates the real positioning algorithm, which is complicated.
-    int total_vertical_padding =
-        (delegate_->IsMaximized() || !delegate_->ShouldShowCaptionButtons()) ?
-            (kCaptionButtonHeight - delegate_->GetIconSize()) :
-            (OBFVL::kFrameBorderThickness + OBFVL::kTitlebarTopEdgeThickness);
-    return (total_vertical_padding + 1) / 2;
+    const int unavailable_px_at_top =
+        delegate_->IsMaximized() ? 0 : OBFVL::kTitlebarTopEdgeThickness;
+    return (unavailable_px_at_top + CaptionY() + kCaptionButtonHeight +
+            OBFVL::kCaptionButtonBottomPadding - delegate_->GetIconSize()) / 2;
   }
 
   void ExpectCaptionButtons(bool caption_buttons_on_left, int extra_height) {
     if (!delegate_->ShouldShowCaptionButtons()) {
       EXPECT_FALSE(maximize_button_->visible());
       EXPECT_FALSE(minimize_button_->visible());
       EXPECT_FALSE(restore_button_->visible());
       EXPECT_FALSE(close_button_->visible());
       return;
     }
@@ skipping 231 matching lines @@
 
   for (int i = 0; i < 2; ++i) {
     root_view_->Layout();
     SCOPED_TRACE(i == 0 ? "Window is restored" : "Window is maximized");
     ExpectCaptionButtons(false, 0);
     ExpectTabStripAndMinimumSize(false);
     ExpectAvatar();
     delegate_->set_maximized(true);
   }
 }