Porting in chrome/views/

chrome/views/scroll_view.h

Index: chrome/views/scroll_view.h
diff --git a/chrome/views/scroll_view.h b/chrome/views/scroll_view.h
index db0685a3c38616b42866e9250ae37a8b6e7f955e..54996b5b939e58110561cdf291ed60681352ef84 100644
--- a/chrome/views/scroll_view.h
+++ b/chrome/views/scroll_view.h
@@ -26,7 +26,7 @@ namespace views {
 class ScrollView : public View,
                    public ScrollBarController {
  public:
-  static const char* const ScrollView::kViewClassName;
+  static const char* const kViewClassName;
 
   ScrollView();
   // Initialize with specific views. resize_corner is optional.
@@ -42,7 +42,7 @@ class ScrollView : public View,
 
   // Overridden to layout the viewport and scrollbars.
   virtual void Layout();
-  
+
   // Returns the visible region of the content View.
   gfx::Rect GetVisibleRect() const;