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 b4f83cc..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() const 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() const 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;