Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / views / controls / scrollbar / native_scroll_bar_views.cc

diff --git a/src/ui/views/controls/scrollbar/native_scroll_bar_views.cc b/src/ui/views/controls/scrollbar/native_scroll_bar_views.cc
index a8402e5..d69f79f 100644 (file)
--- a/src/ui/views/controls/scrollbar/native_scroll_bar_views.cc
+++ b/src/ui/views/controls/scrollbar/native_scroll_bar_views.cc
@@ -30,15 +30,13 @@ class ScrollBarButton : public BaseScrollBarButton {
   };
 
   ScrollBarButton(ButtonListener* listener, Type type);
-  virtual ~ScrollBarButton();
+  ~ScrollBarButton() override;
 
-  virtual gfx::Size GetPreferredSize() OVERRIDE;
-  virtual const char* GetClassName() const OVERRIDE {
-    return "ScrollBarButton";
-  }
+  gfx::Size GetPreferredSize() const override;
+  const char* GetClassName() const override { return "ScrollBarButton"; }
 
  protected:
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  void OnPaint(gfx::Canvas* canvas) override;
 
  private:
   ui::NativeTheme::ExtraParams GetNativeThemeParams() const;
@@ -52,15 +50,13 @@ class ScrollBarButton : public BaseScrollBarButton {
 class ScrollBarThumb : public BaseScrollBarThumb {
  public:
   explicit ScrollBarThumb(BaseScrollBar* scroll_bar);
-  virtual ~ScrollBarThumb();
+  ~ScrollBarThumb() override;
 
-  virtual gfx::Size GetPreferredSize() OVERRIDE;
-  virtual const char* GetClassName() const OVERRIDE {
-    return "ScrollBarThumb";
-  }
+  gfx::Size GetPreferredSize() const override;
+  const char* GetClassName() const override { return "ScrollBarThumb"; }
 
  protected:
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  void OnPaint(gfx::Canvas* canvas) override;
 
  private:
   ui::NativeTheme::ExtraParams GetNativeThemeParams() const;
@@ -83,7 +79,7 @@ ScrollBarButton::ScrollBarButton(ButtonListener* listener, Type type)
 ScrollBarButton::~ScrollBarButton() {
 }
 
-gfx::Size ScrollBarButton::GetPreferredSize() {
+gfx::Size ScrollBarButton::GetPreferredSize() const {
   return GetNativeTheme()->GetPartSize(GetNativeThemePart(),
                                        GetNativeThemeState(),
                                        GetNativeThemeParams());
@@ -164,7 +160,7 @@ ScrollBarThumb::ScrollBarThumb(BaseScrollBar* scroll_bar)
 ScrollBarThumb::~ScrollBarThumb() {
 }
 
-gfx::Size ScrollBarThumb::GetPreferredSize() {
+gfx::Size ScrollBarThumb::GetPreferredSize() const {
   return GetNativeTheme()->GetPartSize(GetNativeThemePart(),
                                        GetNativeThemeState(),
                                        GetNativeThemeParams());
@@ -292,7 +288,7 @@ void NativeScrollBarViews::OnPaint(gfx::Canvas* canvas) {
   GetNativeTheme()->Paint(canvas->sk_canvas(), part_, state_, bounds, params_);
 }
 
-gfx::Size NativeScrollBarViews::GetPreferredSize() {
+gfx::Size NativeScrollBarViews::GetPreferredSize() const {
   const ui::NativeTheme* theme = native_scroll_bar_->GetNativeTheme();
   if (native_scroll_bar_->IsHorizontal())
     return gfx::Size(0, GetHorizontalScrollBarHeight(theme));