Update To 11.40.268.0

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

diff --git a/src/ui/views/controls/slider_unittest.cc b/src/ui/views/controls/slider_unittest.cc
index efa4112..4b8ccad 100644 (file)
--- a/src/ui/views/controls/slider_unittest.cc
+++ b/src/ui/views/controls/slider_unittest.cc
@@ -27,7 +27,7 @@ namespace {
 class TestSliderListener : public views::SliderListener {
  public:
   TestSliderListener();
-  virtual ~TestSliderListener();
+  ~TestSliderListener() override;
 
   int last_event_epoch() {
     return last_event_epoch_;
@@ -53,12 +53,12 @@ class TestSliderListener : public views::SliderListener {
   virtual void ResetCallHistory();
 
   // views::SliderListener:
-  virtual void SliderValueChanged(views::Slider* sender,
-                                  float value,
-                                  float old_value,
-                                  views::SliderChangeReason reason) OVERRIDE;
-  virtual void SliderDragStarted(views::Slider* sender) OVERRIDE;
-  virtual void SliderDragEnded(views::Slider* sender) OVERRIDE;
+  void SliderValueChanged(views::Slider* sender,
+                          float value,
+                          float old_value,
+                          views::SliderChangeReason reason) override;
+  void SliderDragStarted(views::Slider* sender) override;
+  void SliderDragEnded(views::Slider* sender) override;
 
  private:
   // The epoch of the last event.
@@ -121,7 +121,7 @@ namespace views {
 class SliderTest : public views::ViewsTestBase {
  public:
   explicit SliderTest(Slider::Orientation orientation);
-  virtual ~SliderTest();
+  ~SliderTest() override;
 
  protected:
   Slider* slider() {
@@ -143,8 +143,8 @@ class SliderTest : public views::ViewsTestBase {
   virtual void ClickAt(int x, int y);
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  void SetUp() override;
+  void TearDown() override;
 
   ui::test::EventGenerator* event_generator() {
     return event_generator_.get();
@@ -226,7 +226,7 @@ void SliderTest::ClickAt(int x, int y) {
 class HorizontalSliderTest : public SliderTest {
  public:
   HorizontalSliderTest();
-  virtual ~HorizontalSliderTest();
+  ~HorizontalSliderTest() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HorizontalSliderTest);
@@ -243,7 +243,7 @@ HorizontalSliderTest::~HorizontalSliderTest() {
 class VerticalSliderTest : public SliderTest {
  public:
   VerticalSliderTest();
-  virtual ~VerticalSliderTest();
+  ~VerticalSliderTest() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VerticalSliderTest);