Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / wm / core / capture_controller.h

diff --git a/src/ui/wm/core/capture_controller.h b/src/ui/wm/core/capture_controller.h
index d802818..bd9beb9 100644 (file)
--- a/src/ui/wm/core/capture_controller.h
+++ b/src/ui/wm/core/capture_controller.h
@@ -29,17 +29,17 @@ class WM_EXPORT CaptureController : public aura::client::CaptureClient {
   bool is_active() const { return !root_windows_.empty(); }
 
   // Overridden from aura::client::CaptureClient:
-  virtual void SetCapture(aura::Window* window) OVERRIDE;
-  virtual void ReleaseCapture(aura::Window* window) OVERRIDE;
-  virtual aura::Window* GetCaptureWindow() OVERRIDE;
-  virtual aura::Window* GetGlobalCaptureWindow() OVERRIDE;
+  void SetCapture(aura::Window* window) override;
+  void ReleaseCapture(aura::Window* window) override;
+  aura::Window* GetCaptureWindow() override;
+  aura::Window* GetGlobalCaptureWindow() override;
 
  private:
   friend class ScopedCaptureClient;
   typedef std::set<aura::Window*> RootWindows;
 
   CaptureController();
-  virtual ~CaptureController();
+  ~CaptureController() override;
 
   // The current capture window. NULL if there is no capture window.
   aura::Window* capture_window_;
@@ -56,7 +56,7 @@ class WM_EXPORT CaptureController : public aura::client::CaptureClient {
 class WM_EXPORT ScopedCaptureClient : public aura::WindowObserver {
  public:
   explicit ScopedCaptureClient(aura::Window* root);
-  virtual ~ScopedCaptureClient();
+  ~ScopedCaptureClient() override;
 
   // Returns true if there is a CaptureController with at least one RootWindow.
   static bool IsActive();
@@ -66,7 +66,7 @@ class WM_EXPORT ScopedCaptureClient : public aura::WindowObserver {
   }
 
   // Overridden from aura::WindowObserver:
-  virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
+  void OnWindowDestroyed(aura::Window* window) override;
 
  private:
   // Invoked from destructor and OnWindowDestroyed() to cleanup.