Fix opaque app mode display....

chrome/browser/views/frame/opaque_browser_frame_view.cc

 // Copyright (c) 2006-2008 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/views/frame/opaque_browser_frame_view.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
@@ skipping 740 matching lines @@
       otr_avatar_bounds_.width(), otr_avatar_bounds_.height(),
       MirroredLeftPointForRect(otr_avatar_bounds_), otr_avatar_bounds_.y(),
       otr_avatar_bounds_.width(), otr_avatar_bounds_.height(), false);
 }
 
 void OpaqueBrowserFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
   ThemeProvider* tp = GetThemeProvider();
   int client_area_top = frame_->GetWindow()->GetClientView()->y();
 
   gfx::Rect client_area_bounds = CalculateClientAreaBounds(width(), height());
+  SkColor toolbar_color = tp->GetColor(BrowserThemeProvider::COLOR_TOOLBAR);
+
   if (browser_view_->IsToolbarVisible()) {
     // The client edges start below the toolbar or its corner images, whichever
     // is shorter.
     gfx::Rect toolbar_bounds(browser_view_->GetToolbarBounds());
     client_area_top += browser_view_->GetToolbarBounds().y() +
         std::min(tp->GetBitmapNamed(IDR_CONTENT_TOP_LEFT_CORNER)->height(),
                  toolbar_bounds.height());
   } else {
     // The toolbar isn't going to draw a client edge for us, so draw one
     // ourselves.
-    // This next calculation is necessary because the top center bitmap is
-    // shorter than the top left and right bitmaps.  We need their top edges to
-    // line up, and we need the left and right edges to start below the corners'
-    // bottoms.
     SkBitmap* top_left = tp->GetBitmapNamed(IDR_APP_TOP_LEFT);
     SkBitmap* top_center = tp->GetBitmapNamed(IDR_APP_TOP_CENTER);
     SkBitmap* top_right = tp->GetBitmapNamed(IDR_APP_TOP_RIGHT);
     int top_edge_y = client_area_top - top_center->height();
+    int height = client_area_top - top_edge_y;
 
-    client_area_top = std::min(top_edge_y + top_left->height(),
-                               height() - NonClientBorderThickness());
-    int height = client_area_top - top_edge_y;
     canvas->DrawBitmapInt(*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->DrawBitmapInt(*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->DrawLineInt(toolbar_color,
+        client_area_bounds.x() - kClientEdgeThickness,
+        client_area_top - kClientEdgeThickness,
+        client_area_bounds.right() + kClientEdgeThickness,
+        client_area_top - kClientEdgeThickness);
   }
 
   int client_area_bottom =
       std::max(client_area_top, height() - NonClientBorderThickness());
   int client_area_height = client_area_bottom - client_area_top;
 
   // Draw the toolbar color so that the one pixel areas down the sides
   // show the right color even if not covered by the toolbar image.
-  SkColor toolbar_color = tp->GetColor(BrowserThemeProvider::COLOR_TOOLBAR);
   canvas->DrawLineInt(toolbar_color,
       client_area_bounds.x() - kClientEdgeThickness,
       client_area_top,
       client_area_bounds.x() - kClientEdgeThickness,
       client_area_bottom - 1 + kClientEdgeThickness);
   canvas->DrawLineInt(toolbar_color,
       client_area_bounds.x() - kClientEdgeThickness,
       client_area_bottom - 1 + kClientEdgeThickness,
       client_area_bounds.right() + kClientEdgeThickness,
       client_area_bottom - 1 + kClientEdgeThickness);
@@ skipping 170 matching lines @@
   if (!initialized) {
 #if defined(OS_WIN)
     title_font_ = new gfx::Font(win_util::GetWindowTitleFont());
 #else
     NOTIMPLEMENTED();
     title_font_ = new gfx::Font();
 #endif
     initialized = true;
   }
 }