Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / athena / main / athena_frame_view.h

diff --git a/src/athena/main/athena_frame_view.h b/src/athena/main/athena_frame_view.h
index 5140c2d..b3829a8 100644 (file)
--- a/src/athena/main/athena_frame_view.h
+++ b/src/athena/main/athena_frame_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATHENA_COMMON_ATHENA_FRAME_VIEW_H_
-#define ATHENA_COMMON_ATHENA_FRAME_VIEW_H_
+#ifndef ATHENA_MAIN_ATHENA_FRAME_VIEW_H_
+#define ATHENA_MAIN_ATHENA_FRAME_VIEW_H_
 
 #include "ui/views/window/non_client_view.h"
 
@@ -21,24 +21,24 @@ class AthenaFrameView : public views::NonClientFrameView {
   static const char kViewClassName[];
 
   explicit AthenaFrameView(views::Widget* frame);
-  virtual ~AthenaFrameView();
+  ~AthenaFrameView() override;
 
   // views::NonClientFrameView overrides:
-  virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
+  virtual gfx::Rect GetBoundsForClientView() const override;
   virtual gfx::Rect GetWindowBoundsForClientBounds(
-      const gfx::Rect& client_bounds) const OVERRIDE;
-  virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
+      const gfx::Rect& client_bounds) const override;
+  virtual int NonClientHitTest(const gfx::Point& point) override;
   virtual void GetWindowMask(const gfx::Size& size,
-                             gfx::Path* window_mask) OVERRIDE {}
-  virtual void ResetWindowControls() OVERRIDE {}
-  virtual void UpdateWindowIcon() OVERRIDE {}
-  virtual void UpdateWindowTitle() OVERRIDE {}
-  virtual void SizeConstraintsChanged() OVERRIDE {}
+                             gfx::Path* window_mask) override {}
+  virtual void ResetWindowControls() override {}
+  virtual void UpdateWindowIcon() override {}
+  virtual void UpdateWindowTitle() override {}
+  virtual void SizeConstraintsChanged() override {}
 
   // views::View overrides:
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
-  virtual const char* GetClassName() const OVERRIDE;
-  virtual void Layout() OVERRIDE {}
+  virtual gfx::Size GetPreferredSize() const override;
+  virtual const char* GetClassName() const override;
+  virtual void Layout() override {}
 
  private:
   gfx::Insets NonClientBorderInsets() const;
@@ -54,4 +54,4 @@ class AthenaFrameView : public views::NonClientFrameView {
 
 }  // namespace athena
 
-#endif  // ATHENA_COMMON_ATHENA_FRAME_VIEW_H_
+#endif  // ATHENA_MAIN_ATHENA_FRAME_VIEW_H_