Fix opaque frame app mode windows to have correct toolbar/content separator.

chrome/browser/ui/views/frame/opaque_browser_frame_view.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/frame/opaque_browser_frame_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 418 matching lines @@
 }
 
 bool OpaqueBrowserFrameView::IsFullscreen() const {
   return frame()->IsFullscreen();
 }
 
 bool OpaqueBrowserFrameView::IsTabStripVisible() const {
   return browser_view()->IsTabStripVisible();
 }
 
+bool OpaqueBrowserFrameView::IsToolbarVisible() const {
+  return browser_view()->IsToolbarVisible() &&
+      !browser_view()->GetToolbarBounds().IsEmpty();

[sky, 2015/11/18 17:00:34]

It seems like this is called from code from layout like code. Shouldn't this
query whether the toolbar will be given a valid bounds vs whether it currently
has a valid bounds?

[Peter Kasting, 2015/11/18 19:46:24]

I think you're right.  I changed this to use the toolbar's preferred size.

There is one case where I know these would report different values, and that's
when the location bar height is being animated and is current 0.  In that case
it probably makes sense to treat this as "has a toolbar" since presumably we're
about to have a nonzero height.  I'm not certain, because I can't tell what that
animation code is actually used for, so I don't know how to test it.

+}
+
 int OpaqueBrowserFrameView::GetTabStripHeight() const {
   return browser_view()->GetTabStripHeight();
 }
 
 gfx::Size OpaqueBrowserFrameView::GetTabstripPreferredSize() const {
   gfx::Size s = browser_view()->tabstrip()->GetPreferredSize();
   return s;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 10 matching lines @@
     PaintRestoredFrameBorder(canvas);
 
   // The window icon and title are painted by their respective views.
   /* TODO(pkasting):  If this window is active, we should also draw a drop
    * shadow on the title.  This is tricky, because we don't want to hardcode a
    * shadow color (since we want to work with various themes), but we can't
    * alpha-blend either (since the Windows text APIs don't really do this).
    * So we'd need to sample the background color at the right location and
    * synthesize a good shadow color. */
 
-  if (browser_view()->IsToolbarVisible())
+  if (IsToolbarVisible())
     PaintToolbarBackground(canvas);
-  if (!layout_->IsTitleBarCondensed())
-    PaintRestoredClientEdge(canvas);
+  PaintClientEdge(canvas);
 }
 
 // BrowserNonClientFrameView:
 bool OpaqueBrowserFrameView::ShouldPaintAsThemed() const {
   // Theme app and popup windows if |platform_observer_| wants it.
   return browser_view()->IsBrowserTypeNormal() ||
          platform_observer_->IsUsingSystemTheme();
 }
 
 void OpaqueBrowserFrameView::UpdateNewAvatarButtonImpl() {
@@ skipping 283 matching lines @@
     canvas->FillRect(
         gfx::Rect(x + kClientEdgeThickness,
                   toolbar_bounds.bottom() - kClientEdgeThickness,
                   w - (2 * kClientEdgeThickness),
                   kClientEdgeThickness),
         ThemeProperties::GetDefaultColor(
             ThemeProperties::COLOR_TOOLBAR_SEPARATOR));
   }
 }
 
-void OpaqueBrowserFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
+void OpaqueBrowserFrameView::PaintClientEdge(gfx::Canvas* canvas) {
   ui::ThemeProvider* tp = GetThemeProvider();
   int client_area_top = frame()->client_view()->y();
   int image_top = client_area_top;
 
   gfx::Rect client_area_bounds =
       layout_->CalculateClientAreaBounds(width(), height());
   SkColor toolbar_color = tp->GetColor(ThemeProperties::COLOR_TOOLBAR);
 
-  if (browser_view()->IsToolbarVisible()) {
+  if (IsToolbarVisible()) {
     // The client edge images start below the toolbar.
     gfx::Rect toolbar_bounds(browser_view()->GetToolbarBounds());
     client_area_top += toolbar_bounds.bottom();
     image_top = client_area_top;
-  } else if (!browser_view()->IsTabStripVisible()) {
-    // The toolbar isn't going to draw a client edge for us, so draw one
-    // ourselves.
+  } else {
+    // The toolbar isn't going to draw a top edge for us, so draw one ourselves.
     gfx::ImageSkia* top_left = tp->GetImageSkiaNamed(IDR_APP_TOP_LEFT);
     gfx::ImageSkia* top_center = tp->GetImageSkiaNamed(IDR_APP_TOP_CENTER);
     gfx::ImageSkia* top_right = tp->GetImageSkiaNamed(IDR_APP_TOP_RIGHT);
     int top_edge_y = client_area_top - top_center->height();
     int height = client_area_top - top_edge_y;
 
     canvas->DrawImageInt(*top_left, 0, 0, top_left->width(), height,
         client_area_bounds.x() - top_left->width(), top_edge_y,
         top_left->width(), height, false);
     canvas->TileImageInt(*top_center, 0, 0, client_area_bounds.x(), top_edge_y,
       client_area_bounds.width(), std::min(height, top_center->height()));
     canvas->DrawImageInt(*top_right, 0, 0, top_right->width(), height,
         client_area_bounds.right(), top_edge_y,
         top_right->width(), height, false);
 
     // Draw the toolbar color across the top edge.
     canvas->FillRect(gfx::Rect(client_area_bounds.x() - kClientEdgeThickness,
         client_area_top - kClientEdgeThickness,
         client_area_bounds.width() + (2 * kClientEdgeThickness),
         kClientEdgeThickness), toolbar_color);
   }
 
+  // In maximized mode, the only edge to draw is the top one, so we're done.
+  if (layout_->IsTitleBarCondensed())
+    return;
+
   int client_area_bottom =
       std::max(client_area_top, height() - NonClientBorderThickness());
   int image_height = client_area_bottom - image_top;
 
   // Draw the client edge images.
   gfx::ImageSkia* right = tp->GetImageSkiaNamed(IDR_CONTENT_RIGHT_SIDE);
   canvas->TileImageInt(*right, client_area_bounds.right(), image_top,
                        right->width(), image_height);
   canvas->DrawImageInt(
       *tp->GetImageSkiaNamed(IDR_CONTENT_BOTTOM_RIGHT_CORNER),
@@ skipping 19 matching lines @@
       client_area_bottom + kClientEdgeThickness - client_area_top),
        toolbar_color);
   canvas->FillRect(gfx::Rect(client_area_bounds.x(), client_area_bottom,
                              client_area_bounds.width(), kClientEdgeThickness),
                    toolbar_color);
   canvas->FillRect(gfx::Rect(client_area_bounds.right(), client_area_top,
       kClientEdgeThickness,
       client_area_bottom + kClientEdgeThickness - client_area_top),
       toolbar_color);
 }