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

chrome/browser/ui/views/frame/glass_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/glass_browser_frame_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 432 matching lines @@
   const ui::ThemeProvider* tp = GetThemeProvider();
   const SkColor toolbar_color =
       normal_mode
           ? tp->GetColor(ThemeProperties::COLOR_TOOLBAR)
           : ThemeProperties::GetDefaultColor(ThemeProperties::COLOR_TOOLBAR,
                                              browser_view()->IsOffTheRecord());
 
   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.
     return;
   }
 
   // In maximized mode, the only edge to draw is the top one, so we're done.
   if (frame()->IsMaximized())
     return;
 
@@ skipping 213 matching lines @@
   static bool initialized = false;
   if (!initialized) {
     for (int i = 0; i < kThrobberIconCount; ++i) {
       throbber_icons_[i] =
           ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i);
       DCHECK(throbber_icons_[i]);
     }
     initialized = true;
   }
 }