Improved OTR avatar and popup window rendering.

chrome/browser/views/location_bar_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H__
 #define CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H__
 
 #include <string>
 
 #include "base/gfx/rect.h"
@@ skipping 103 matching lines @@
   // Overridden from LocationBar:
   virtual void ShowFirstRunBubble();
   virtual std::wstring GetInputString() const;
   virtual WindowOpenDisposition GetWindowOpenDisposition() const;
   virtual PageTransition::Type GetPageTransition() const;
   virtual void AcceptInput();
   virtual void FocusLocation();
   virtual void FocusSearch();
   virtual void SaveStateToContents(TabContents* contents);
 
-  static const int kTextVertMargin;
+  static const int kVertMargin;
   static const COLORREF kBackgroundColorByLevel[];
 
  protected:
   void Focus();
 
   // Overridden from Chrome::View.
   virtual bool ShouldLookupAccelerators(const views::KeyEvent& e);
 
  private:
   // View used when the user has selected a keyword.
@@ skipping 141 matching lines @@
 
     DISALLOW_EVIL_CONSTRUCTORS(SecurityImageView);
   };
 
   // Both Layout and OnChanged call into this. This updates the contents
   // of the 3 views: selected_keyword, keyword_hint and type_search_view. If
   // force_layout is true, or one of these views has changed in such a way as
   // to necessitate a layout, layout occurs as well.
   void DoLayout(bool force_layout);
 
+  // Returns the number of pixels to clip off the top edge of the background
+  // graphics.  With the Vista frame, the DWM draws a dark border around the
+  // content, so we clip the single dark pixel on the popup background image,
+  // which otherwise looks redundant.
+  int TopOffset() const;
+
+  // Returns the height in pixels of the margin at the top of the bar, after
+  // TopOffset() pixels have been clipped off.
+  int TopMargin() const;
+
   // Returns the width in pixels of the contents of the edit.
   int TextDisplayWidth();
 
   // Returns true if the preferred size should be used for a view whose width
   // is pref_width, the width of the text in the edit is text_width, and
   // max_width is the maximum width of the edit. If this returns false, the
   // minimum size of the view should be used.
   bool UsePref(int pref_width, int text_width, int max_width);
 
   // Returns true if the view needs to be resized. This determines whether the
@@ skipping 86 matching lines @@
   // When true, the location bar view is read only and also is has a slightly
   // different presentation (font size / color). This is used for popups.
   bool popup_window_mode_;
 
   // Used schedule a task for the first run info bubble.
   ScopedRunnableMethodFactory<LocationBarView> first_run_bubble_;
 };
 
 #endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H__