Improved OTR avatar and popup window rendering.

chrome/browser/views/toolbar_view.cc

Index: chrome/browser/views/toolbar_view.cc
===================================================================
--- chrome/browser/views/toolbar_view.cc	(revision 9107)
+++ chrome/browser/views/toolbar_view.cc	(working copy)
@@ -35,6 +35,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
+#include "chrome/common/win_util.h"
 #include "chrome/views/background.h"
 #include "chrome/views/button_dropdown.h"
 #include "chrome/views/hwnd_view.h"
@@ -479,13 +480,15 @@
     return gfx::Size(0, normal_background.height());
   }
 
+  // With the non-Vista frame, we'll draw a client edge below the toolbar for
+  // non-maximized popups.
   // Note: We make sure to return the same value in the "no browser window" case
   // as the "not maximized" case, so that when a popup is opened at a particular
   // requested size, we'll report the same preferred size during the initial
   // window size calculation (when there isn't yet a browser window) as when
   // we're actually laying things out after setting up the browser window.  This
   // prevents the content area from being off by |kClientEdgeThickness| px.
-  int client_edge_height =
+  int client_edge_height = win_util::ShouldUseVistaFrame() ||
       (browser_->window() && browser_->window()->IsMaximized()) ?
       0 : views::NonClientView::kClientEdgeThickness;
   return gfx::Size(0,