Misc. small changes in preparation for moving popup mode edge drawing.

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

Index: chrome/browser/ui/views/frame/glass_browser_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc
index 2cdcdd638db20ccef964defe77c9b3da2d38823c..d686269cd7a2eff9e970b8a1c002326f69248a3d 100644
--- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc
@@ -450,11 +450,9 @@ void GlassBrowserFrameView::PaintClientEdge(gfx::Canvas* canvas) const {
   const gfx::Rect toolbar_bounds(browser_view()->GetToolbarBounds());
   if (!normal_mode) {
     // The toolbar isn't going to draw a top edge for us, so draw one ourselves.
-    if (IsToolbarVisible())
-      y += toolbar_bounds.y() + kClientEdgeThickness;
-    client_bounds.set_y(y);
-    client_bounds.Inset(-kClientEdgeThickness, -kClientEdgeThickness,
-                        -kClientEdgeThickness, client_bounds.height());
+    client_bounds.Offset(0, toolbar_bounds.y());
+    client_bounds.Inset(-kClientEdgeThickness, 0, -kClientEdgeThickness,
+                        client_bounds.height() - kClientEdgeThickness);
     canvas->FillRect(client_bounds, toolbar_color);
 
     // Popup and app windows don't custom-draw any other edges, so we're done.