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

chrome/browser/ui/views/location_bar/location_bar_view.h

Index: chrome/browser/ui/views/location_bar/location_bar_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index 8942cced3b033e8710029a6d3882e27b0e955021..6ed1fb8a8c6e60377b7103d2104786c397260af3 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -77,9 +77,6 @@ class LocationBarView : public LocationBar,
                         public TemplateURLServiceObserver,
                         public ui_zoom::ZoomEventManagerObserver {
  public:
-  // The location bar view's class name.
-  static const char kViewClassName[];
-
   class Delegate {
    public:
     // Should return the current web contents.
@@ -120,6 +117,9 @@ class LocationBarView : public LocationBar,
     EV_BUBBLE_TEXT_AND_BORDER,
   };
 
+  // The location bar view's class name.
+  static const char kViewClassName[];
+
   LocationBarView(Browser* browser,
                   Profile* profile,
                   CommandUpdater* command_updater,