views: Move the overridden methods of ProgressBar to private section.

views/controls/progress_bar.cc

 // 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/progress_bar.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/insets.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/painter.h"
 
-using std::max;
-using std::min;
-
 namespace {
 
 // Corner radius for the progress bar's border.
 const int kCornerRadius = 3;
 
 // Progress bar's border width
 const int kBorderWidth = 1;
 
 void AddRoundRectPathWithPadding(int x, int y,
                                  int w, int h,
@@ skipping 99 matching lines @@
 
 ProgressBar::ProgressBar()
     : min_display_value_(0.0),
       max_display_value_(1.0),
       current_value_(0.0) {
 }
 
 ProgressBar::~ProgressBar() {
 }
 
-gfx::Size ProgressBar::GetPreferredSize() {
-  return gfx::Size(100, 16);
+void ProgressBar::SetDisplayRange(double min_display_value,
+                                  double max_display_value) {
+  if (min_display_value != min_display_value_ ||
+      max_display_value != max_display_value_) {
+    DCHECK(min_display_value < max_display_value);
+    min_display_value_ = min_display_value;
+    max_display_value_ = max_display_value;
+    SchedulePaint();
+  }
 }
 
-std::string ProgressBar::GetClassName() const {
-  return kViewClassName;
+void ProgressBar::SetValue(double value) {
+  if (value != current_value_) {
+    current_value_ = value;
+    SchedulePaint();
+  }
+}
+
+void ProgressBar::SetTooltipText(const string16& tooltip_text) {
+  tooltip_text_ = tooltip_text;
+}
+
+bool ProgressBar::GetTooltipText(const gfx::Point& p, string16* tooltip) const {
+  DCHECK(tooltip);
+  if (tooltip == NULL)
+    return false;
+  tooltip->assign(tooltip_text_);
+  return !tooltip_text_.empty();
 }
 
 void ProgressBar::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PROGRESSBAR;
   state->state = ui::AccessibilityTypes::STATE_READONLY;
 }
 
+gfx::Size ProgressBar::GetPreferredSize() {
+  return gfx::Size(100, 16);
+}
+
+std::string ProgressBar::GetClassName() const {
+  return kViewClassName;
+}
+
 void ProgressBar::OnPaint(gfx::Canvas* canvas) {
-  const double capped_value =
-      min(max(current_value_, min_display_value_), max_display_value_);
+  const double capped_value = std::min(
+      std::max(current_value_, min_display_value_), max_display_value_);
   const double capped_fraction =
       (capped_value - min_display_value_) /
       (max_display_value_ - min_display_value_);
   const int progress_width = static_cast<int>(width() * capped_fraction + 0.5);
 
 #if defined(OS_CHROMEOS)
   const SkColor background_colors[] = {
     SkColorSetRGB(0xBB, 0xBB, 0xBB),
     SkColorSetRGB(0xE7, 0xE7, 0xE7),
     SkColorSetRGB(0xFE, 0xFE, 0xFE)
@@ skipping 110 matching lines @@
   }
   StrokeRoundRect(canvas,
                   0, 0,
                   width(), height(),
                   kCornerRadius,
                   border_color,
                   kBorderWidth);
 #endif
 }
 
-bool ProgressBar::GetTooltipText(const gfx::Point& p, string16* tooltip) const {
-  DCHECK(tooltip);
-  if (tooltip == NULL)
-    return false;
-  tooltip->assign(tooltip_text_);
-  return !tooltip_text_.empty();
-}
-
-void ProgressBar::SetDisplayRange(double min_display_value,
-                                  double max_display_value) {
-  if (min_display_value != min_display_value_ ||
-      max_display_value != max_display_value_) {
-    DCHECK(min_display_value < max_display_value);
-    min_display_value_ = min_display_value;
-    max_display_value_ = max_display_value;
-    SchedulePaint();
-  }
-}
-
-void ProgressBar::SetValue(double value) {
-  if (value != current_value_) {
-    current_value_ = value;
-    SchedulePaint();
-  }
-}
-
-void ProgressBar::SetTooltipText(const string16& tooltip_text) {
-  tooltip_text_ = tooltip_text;
-}
-
 }  // namespace views