Improved OTR avatar and popup window rendering.

chrome/browser/autocomplete/autocomplete_popup.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/autocomplete/autocomplete_popup.h"
 
 #include <cmath>
 
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
@@ skipping 104 matching lines @@
   gfx::Point top_left(-rc.TopLeft());
   views::View::ConvertPointToScreen(edit_view_->parent_view(), &top_left);
   rc.OffsetRect(top_left.ToPOINT());
   // Expand by one pixel on each side since that's the amount the location bar
   // view is inset from the divider line that edges the adjacent buttons.
   // Deflate the top and bottom by the height of the extra graphics around the
   // edit.
   // TODO(pkasting): http://b/972786 This shouldn't be hardcoded to rely on
   // LocationBarView constants.  Instead we should just make the edit be "at the
   // right coordinates", or something else generic.
-  rc.InflateRect(1, -LocationBarView::kTextVertMargin);
+  rc.InflateRect(1, -LocationBarView::kVertMargin);
   // Now rc is the exact width we want and is positioned like the edit would
   // be, so shift the top and bottom downwards so the new top is where the old
   // bottom is and the rect has the height we need for all our entries, plus a
   // one-pixel border on top and bottom.
   rc.top = rc.bottom;
   rc.bottom += static_cast<int>(result.size()) * line_info_.line_height + 2;
 
   if (!m_hWnd) {
     // To prevent this window from being activated, we create an invisible
     // window and manually show it without activating it.
@@ skipping 839 matching lines @@
       }
       edit_model_->OnPopupDataChanged(inline_autocomplete_text, false, keyword,
           is_keyword_hint, type);
       return;
     }
 
     default:
       NOTREACHED();
   }
 }