Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / athena / main / athena_views_delegate.cc

diff --git a/src/athena/main/athena_views_delegate.cc b/src/athena/main/athena_views_delegate.cc
index 4db7ff9..17dab73 100644 (file)
--- a/src/athena/main/athena_views_delegate.cc
+++ b/src/athena/main/athena_views_delegate.cc
@@ -17,17 +17,16 @@ class AthenaViewsDelegate: public views::ViewsDelegate {
   AthenaViewsDelegate() {
   }
 
-  virtual ~AthenaViewsDelegate() {
-  }
+  ~AthenaViewsDelegate() override {}
 
   virtual void OnBeforeWidgetInit(
       views::Widget::InitParams* params,
-      views::internal::NativeWidgetDelegate* delegate) OVERRIDE {
+      views::internal::NativeWidgetDelegate* delegate) override {
     params->context = athena::ScreenManager::Get()->GetContext();
   }
 
   virtual views::NonClientFrameView* CreateDefaultNonClientFrameView(
-      views::Widget* widget) OVERRIDE {
+      views::Widget* widget) override {
     return new AthenaFrameView(widget);
   }
 
@@ -44,7 +43,7 @@ void CreateAthenaViewsDelegate() {
 void ShutdownAthenaViewsDelegate() {
   CHECK(views::ViewsDelegate::views_delegate);
   delete views::ViewsDelegate::views_delegate;
-  views::ViewsDelegate::views_delegate = NULL;
+  views::ViewsDelegate::views_delegate = nullptr;
 }
 
 }  // namespace athena