Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / wm / immersive_fullscreen_controller_unittest.cc

diff --git a/src/ash/wm/immersive_fullscreen_controller_unittest.cc b/src/ash/wm/immersive_fullscreen_controller_unittest.cc
index 5257b4a..7195429 100644 (file)
--- a/src/ash/wm/immersive_fullscreen_controller_unittest.cc
+++ b/src/ash/wm/immersive_fullscreen_controller_unittest.cc
@@ -39,24 +39,22 @@ class MockImmersiveFullscreenControllerDelegate
         enabled_(false),
         visible_fraction_(1) {
   }
-  virtual ~MockImmersiveFullscreenControllerDelegate() {}
+  ~MockImmersiveFullscreenControllerDelegate() override {}
 
   // ImmersiveFullscreenController::Delegate overrides:
-  virtual void OnImmersiveRevealStarted() OVERRIDE {
+  void OnImmersiveRevealStarted() override {
     enabled_ = true;
     visible_fraction_ = 0;
   }
-  virtual void OnImmersiveRevealEnded() OVERRIDE {
-    visible_fraction_ = 0;
-  }
-  virtual void OnImmersiveFullscreenExited() OVERRIDE {
+  void OnImmersiveRevealEnded() override { visible_fraction_ = 0; }
+  void OnImmersiveFullscreenExited() override {
     enabled_ = false;
     visible_fraction_ = 1;
   }
-  virtual void SetVisibleFraction(double visible_fraction) OVERRIDE {
+  void SetVisibleFraction(double visible_fraction) override {
     visible_fraction_ = visible_fraction;
   }
-  virtual std::vector<gfx::Rect> GetVisibleBoundsInScreen() const OVERRIDE {
+  std::vector<gfx::Rect> GetVisibleBoundsInScreen() const override {
     std::vector<gfx::Rect> bounds_in_screen;
     bounds_in_screen.push_back(top_container_view_->GetBoundsInScreen());
     return bounds_in_screen;
@@ -81,10 +79,10 @@ class MockImmersiveFullscreenControllerDelegate
 class ConsumeEventHandler : public ui::test::TestEventHandler {
  public:
   ConsumeEventHandler() {}
-  virtual ~ConsumeEventHandler() {}
+  ~ConsumeEventHandler() override {}
 
  private:
-  virtual void OnEvent(ui::Event* event) OVERRIDE {
+  void OnEvent(ui::Event* event) override {
     ui::test::TestEventHandler::OnEvent(event);
     if (event->cancelable())
       event->SetHandled();
@@ -109,7 +107,7 @@ class ImmersiveFullscreenControllerTest : public ash::test::AshTestBase {
       : widget_(NULL),
         top_container_(NULL),
         content_view_(NULL) {}
-  virtual ~ImmersiveFullscreenControllerTest() {}
+  ~ImmersiveFullscreenControllerTest() override {}
 
   ImmersiveFullscreenController* controller() {
     return controller_.get();
@@ -142,7 +140,7 @@ class ImmersiveFullscreenControllerTest : public ash::test::AshTestBase {
   }
 
   // ash::test::AshTestBase overrides:
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     ash::test::AshTestBase::SetUp();
 
     widget_ = new views::Widget();