From 87a47f52c9a940e8cc384bb4e08049e45e26fc63 Mon Sep 17 00:00:00 2001
From: timav <timav@chromium.org>
Date: Wed, 15 Oct 2014 18:09:56 -0700
Subject: [PATCH] Fix CanScrollOrientation method name.

Change the method name from can_scroll_orientation() to
CanScrollOrienattion() to comply with the style guide.

This is a follow up to https://codereview.chromium.org/655783004

BUG=370892

Review URL: https://codereview.chromium.org/637283004

Cr-Commit-Position: refs/heads/master@{#299803}
---
 cc/animation/scrollbar_animation_controller_linear_fade.cc | 2 +-
 cc/animation/scrollbar_animation_controller_thinning.cc    | 2 +-
 cc/layers/scrollbar_layer_impl_base.cc                     | 2 +-
 cc/layers/scrollbar_layer_impl_base.h                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cc/animation/scrollbar_animation_controller_linear_fade.cc b/cc/animation/scrollbar_animation_controller_linear_fade.cc
index f65fd727ac4f..1b5dfd933daf 100644
--- a/cc/animation/scrollbar_animation_controller_linear_fade.cc
+++ b/cc/animation/scrollbar_animation_controller_linear_fade.cc
@@ -64,7 +64,7 @@ void ScrollbarAnimationControllerLinearFade::ApplyOpacityToScrollbars(
     ScrollbarLayerImplBase* scrollbar = *it;
 
     if (scrollbar->is_overlay_scrollbar())
-      scrollbar->SetOpacity(scrollbar->can_scroll_orientation() ? opacity : 0);
+      scrollbar->SetOpacity(scrollbar->CanScrollOrientation() ? opacity : 0);
   }
 }
 
diff --git a/cc/animation/scrollbar_animation_controller_thinning.cc b/cc/animation/scrollbar_animation_controller_thinning.cc
index e95b5994ecf5..0405074b55a3 100644
--- a/cc/animation/scrollbar_animation_controller_thinning.cc
+++ b/cc/animation/scrollbar_animation_controller_thinning.cc
@@ -146,7 +146,7 @@ void ScrollbarAnimationControllerThinning::ApplyOpacityAndThumbThicknessScale(
     ScrollbarLayerImplBase* scrollbar = *it;
     if (scrollbar->is_overlay_scrollbar()) {
       float effectiveOpacity =
-          scrollbar->can_scroll_orientation()
+          scrollbar->CanScrollOrientation()
               ? AdjustScale(opacity, scrollbar->opacity(), opacity_change_)
               : 0;
 
diff --git a/cc/layers/scrollbar_layer_impl_base.cc b/cc/layers/scrollbar_layer_impl_base.cc
index b11e981e8090..8d93a5456c38 100644
--- a/cc/layers/scrollbar_layer_impl_base.cc
+++ b/cc/layers/scrollbar_layer_impl_base.cc
@@ -122,7 +122,7 @@ bool ScrollbarLayerImplBase::SetMaximum(int maximum) {
   return true;
 }
 
-bool ScrollbarLayerImplBase::can_scroll_orientation() const {
+bool ScrollbarLayerImplBase::CanScrollOrientation() const {
   if (!scroll_layer_)
     return false;
   return scroll_layer_->user_scrollable(orientation()) && (0 < maximum());
diff --git a/cc/layers/scrollbar_layer_impl_base.h b/cc/layers/scrollbar_layer_impl_base.h
index 91cff32e2486..85dc643b4e84 100644
--- a/cc/layers/scrollbar_layer_impl_base.h
+++ b/cc/layers/scrollbar_layer_impl_base.h
@@ -44,7 +44,7 @@ class CC_EXPORT ScrollbarLayerImplBase : public LayerImpl {
     return is_left_side_vertical_scrollbar_;
   }
 
-  bool can_scroll_orientation() const;
+  bool CanScrollOrientation() const;
 
   virtual void PushPropertiesTo(LayerImpl* layer) override;
   virtual ScrollbarLayerImplBase* ToScrollbarLayer() override;
-- 
2.11.4.GIT