views: Convert some functions of ScrollBar class to unix_hacker style.

R=sky@chromium.org

Review URL: http://codereview.chromium.org/7980056

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102498 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 33 insertions, 47 deletions

diff --git a/views/controls/scrollbar/base_scroll_bar.cc b/views/controls/scrollbar/base_scroll_bar.cc
index d18d4fd..a054ceb 100644
--- a/views/controls/scrollbar/base_scroll_bar.cc
+++ b/views/controls/scrollbar/base_scroll_bar.cc
@@ -338,11 +338,11 @@ CustomButton::ButtonState BaseScrollBar::GetThumbTrackState() const {
 }
 
 void BaseScrollBar::ScrollToPosition(int position) {
-  GetController()->ScrollToPosition(this, position);
+  controller()->ScrollToPosition(this, position);
 }
 
 int BaseScrollBar::GetScrollIncrement(bool is_page, bool is_positive) {
-  return GetController()->GetScrollIncrement(this, is_page, is_positive);
+  return controller()->GetScrollIncrement(this, is_page, is_positive);
 }
 
 
diff --git a/views/controls/scrollbar/native_scroll_bar_gtk.cc b/views/controls/scrollbar/native_scroll_bar_gtk.cc
index cd9bebd..df6d904 100644
--- a/views/controls/scrollbar/native_scroll_bar_gtk.cc
+++ b/views/controls/scrollbar/native_scroll_bar_gtk.cc
@@ -138,7 +138,7 @@ void NativeScrollBarGtk::Update(int viewport_size,
   if (current_pos > content_size)
     current_pos = content_size;
 
-  ScrollBarController* controller = native_scroll_bar_->GetController();
+  ScrollBarController* controller = native_scroll_bar_->controller();
   int step = controller->GetScrollIncrement(native_scroll_bar_,
                                             false /* step */,
                                             true /* positive */);
@@ -157,7 +157,7 @@ void NativeScrollBarGtk::Update(int viewport_size,
 // NativeScrollBarGtk, private:
 
 void NativeScrollBarGtk::ValueChanged() {
-  ScrollBarController* controller = native_scroll_bar_->GetController();
+  ScrollBarController* controller = native_scroll_bar_->controller();
   controller->ScrollToPosition(native_scroll_bar_, GetPosition());
 }
 
@@ -172,12 +172,12 @@ void NativeScrollBarGtk::MoveBy(int o) {
 }
 
 void NativeScrollBarGtk::MovePage(bool positive) {
-  ScrollBarController* controller = native_scroll_bar_->GetController();
+  ScrollBarController* controller = native_scroll_bar_->controller();
   MoveBy(controller->GetScrollIncrement(native_scroll_bar_, true, positive));
 }
 
 void NativeScrollBarGtk::MoveStep(bool positive) {
-  ScrollBarController* controller = native_scroll_bar_->GetController();
+  ScrollBarController* controller = native_scroll_bar_->controller();
   MoveBy(controller->GetScrollIncrement(native_scroll_bar_, false, positive));
 }
 
diff --git a/views/controls/scrollbar/native_scroll_bar_views.cc b/views/controls/scrollbar/native_scroll_bar_views.cc
index 3489a45..ac1bc89 100644
--- a/views/controls/scrollbar/native_scroll_bar_views.cc
+++ b/views/controls/scrollbar/native_scroll_bar_views.cc
@@ -246,7 +246,7 @@ NativeScrollBarViews::NativeScrollBarViews(NativeScrollBar* scroll_bar)
     : BaseScrollBar(scroll_bar->IsHorizontal(),
                     new ScrollBarThumb(this)),
       native_scroll_bar_(scroll_bar) {
-  SetController(native_scroll_bar_->GetController());
+  set_controller(native_scroll_bar_->controller());
 
   if (native_scroll_bar_->IsHorizontal()) {
     prev_button_ = new ScrollBarButton(this, ScrollBarButton::LEFT);
@@ -325,14 +325,13 @@ int NativeScrollBarViews::GetLayoutSize() const {
 }
 
 void NativeScrollBarViews::ScrollToPosition(int position) {
-  GetController()->ScrollToPosition(native_scroll_bar_, position);
+  controller()->ScrollToPosition(native_scroll_bar_, position);
 }
 
-int NativeScrollBarViews::GetScrollIncrement(bool is_page,
-                                             bool is_positive) {
-  return GetController()->GetScrollIncrement(native_scroll_bar_,
-                                             is_page,
-                                             is_positive);
+int NativeScrollBarViews::GetScrollIncrement(bool is_page, bool is_positive) {
+  return controller()->GetScrollIncrement(native_scroll_bar_,
+                                          is_page,
+                                          is_positive);
 }
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/views/controls/scrollbar/native_scroll_bar_win.cc b/views/controls/scrollbar/native_scroll_bar_win.cc
index e46e52a..2f18db3 100644
--- a/views/controls/scrollbar/native_scroll_bar_win.cc
+++ b/views/controls/scrollbar/native_scroll_bar_win.cc
@@ -64,8 +64,7 @@ class ScrollBarContainer : public ui::WindowImpl {
     else if (pos > parent_->GetMaxPosition())
       pos = parent_->GetMaxPosition();
 
-    ScrollBarController* sbc = parent_->GetController();
-    sbc->ScrollToPosition(parent_, pos);
+    parent_->controller()->ScrollToPosition(parent_, pos);
 
     si.nPos = pos;
     si.fMask = SIF_POS;
@@ -124,7 +123,7 @@ class ScrollBarContainer : public ui::WindowImpl {
     GetScrollInfo(scrollbar_, SB_CTL, &si);
     pos = si.nPos;
 
-    ScrollBarController* sbc = parent_->GetController();
+    ScrollBarController* sbc = parent_->controller();
 
     switch (code) {
       case SB_BOTTOM:  // case SB_RIGHT:
diff --git a/views/controls/scrollbar/scroll_bar.cc b/views/controls/scrollbar/scroll_bar.cc
index 880a42a..9a01fa9 100644
--- a/views/controls/scrollbar/scroll_bar.cc
+++ b/views/controls/scrollbar/scroll_bar.cc
@@ -1,25 +1,13 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "views/controls/scrollbar/scroll_bar.h"
 
-#include "base/logging.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 
 namespace views {
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// ScrollBar implementation
-//
-/////////////////////////////////////////////////////////////////////////////
-
-ScrollBar::ScrollBar(bool is_horiz) : is_horiz_(is_horiz),
-                                      controller_(NULL),
-                                      max_pos_(0) {
-}
-
 ScrollBar::~ScrollBar() {
 }
 
@@ -31,14 +19,6 @@ bool ScrollBar::IsHorizontal() const {
   return is_horiz_;
 }
 
-void ScrollBar::SetController(ScrollBarController* controller) {
-  controller_ = controller;
-}
-
-ScrollBarController* ScrollBar::GetController() const {
-  return controller_;
-}
-
 void ScrollBar::Update(int viewport_size, int content_size, int current_pos) {
   max_pos_ = std::max(0, content_size - viewport_size);
 }
@@ -51,4 +31,10 @@ int ScrollBar::GetMinPosition() const {
   return 0;
 }
 
+ScrollBar::ScrollBar(bool is_horiz)
+    : is_horiz_(is_horiz),
+      controller_(NULL),
+      max_pos_(0) {
+}
+
 }  // namespace views
diff --git a/views/controls/scrollbar/scroll_bar.h b/views/controls/scrollbar/scroll_bar.h
index a2115c3..17550f9 100644
--- a/views/controls/scrollbar/scroll_bar.h
+++ b/views/controls/scrollbar/scroll_bar.h
@@ -6,8 +6,10 @@
 #define VIEWS_CONTROLS_SCROLLBAR_SCROLLBAR_H_
 #pragma once
 
-#include "views/events/event.h"
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "views/view.h"
+#include "views/views_export.h"
 
 namespace views {
 
@@ -62,18 +64,19 @@ class VIEWS_EXPORT ScrollBar : public View {
   // Overridden from View:
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
-  // Return whether this scrollbar is horizontal
+  // Returns whether this scrollbar is horizontal.
   bool IsHorizontal() const;
 
-  // Set / Get the controller
-  void SetController(ScrollBarController* controller);
-  ScrollBarController* GetController() const;
+  void set_controller(ScrollBarController* controller) {
+     controller_ = controller;
+  }
+  ScrollBarController* controller() const { return controller_; }
 
   // Update the scrollbar appearance given a viewport size, content size and
   // current position
   virtual void Update(int viewport_size, int content_size, int current_pos);
 
-  // Return the max and min positions
+  // Returns the max and min positions.
   int GetMaxPosition() const;
   int GetMinPosition() const;
 
@@ -94,14 +97,13 @@ class VIEWS_EXPORT ScrollBar : public View {
  private:
   const bool is_horiz_;
 
-  // Current controller
   ScrollBarController* controller_;
 
-  // properties
   int max_pos_;
+
+  DISALLOW_COPY_AND_ASSIGN(ScrollBar);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_SCROLLBAR_SCROLLBAR_H_
-
diff --git a/views/controls/scrollbar/scrollbar_unittest.cc b/views/controls/scrollbar/scrollbar_unittest.cc
index 9b84685..810b241 100644
--- a/views/controls/scrollbar/scrollbar_unittest.cc
+++ b/views/controls/scrollbar/scrollbar_unittest.cc
@@ -62,7 +62,7 @@ class NativeScrollBarTest : public ViewsTestBase {
     ASSERT_FALSE(scrollbar_);
     native_scrollbar_ = new NativeScrollBar(true);
     native_scrollbar_->SetBounds(0, 0, 100, 100);
-    native_scrollbar_->SetController(controller_.get());
+    native_scrollbar_->set_controller(controller_.get());
 
     widget_ = new Widget;
     Widget::InitParams params(Widget::InitParams::TYPE_POPUP);