Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / views / controls / scrollbar / native_scroll_bar.h

diff --git a/src/ui/views/controls/scrollbar/native_scroll_bar.h b/src/ui/views/controls/scrollbar/native_scroll_bar.h
index 058784d..70b14c1 100644 (file)
--- a/src/ui/views/controls/scrollbar/native_scroll_bar.h
+++ b/src/ui/views/controls/scrollbar/native_scroll_bar.h
@@ -29,7 +29,7 @@ class VIEWS_EXPORT NativeScrollBar : public ScrollBar {
 
   // Create new scrollbar, either horizontal or vertical.
   explicit NativeScrollBar(bool is_horiz);
-  virtual ~NativeScrollBar();
+  ~NativeScrollBar() override;
 
   // Return the system sizes.
   static int GetHorizontalScrollBarHeight(const ui::NativeTheme* theme);
@@ -40,25 +40,23 @@ class VIEWS_EXPORT NativeScrollBar : public ScrollBar {
   FRIEND_TEST_ALL_PREFIXES(NativeScrollBarTest, Scrolling);
 
   // Overridden from View.
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
-  virtual void Layout() OVERRIDE;
-  virtual void ViewHierarchyChanged(
-      const ViewHierarchyChangedDetails& details) OVERRIDE;
-  virtual const char* GetClassName() const OVERRIDE;
+  gfx::Size GetPreferredSize() const override;
+  void Layout() override;
+  void ViewHierarchyChanged(
+      const ViewHierarchyChangedDetails& details) override;
+  const char* GetClassName() const override;
 
   // Overrideen from View for keyboard UI purpose.
-  virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
-  virtual bool OnMouseWheel(const ui::MouseWheelEvent& e) OVERRIDE;
+  bool OnKeyPressed(const ui::KeyEvent& event) override;
+  bool OnMouseWheel(const ui::MouseWheelEvent& e) override;
 
   // Overridden from ui::EventHandler.
-  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+  void OnGestureEvent(ui::GestureEvent* event) override;
 
   // Overridden from ScrollBar.
-  virtual void Update(int viewport_size,
-                      int content_size,
-                      int current_pos) OVERRIDE;
-  virtual int GetPosition() const OVERRIDE;
-  virtual int GetLayoutSize() const OVERRIDE;
+  void Update(int viewport_size, int content_size, int current_pos) override;
+  int GetPosition() const override;
+  int GetLayoutSize() const override;
 
   // init border
   NativeScrollBarWrapper* native_wrapper_;