replace OVERRIDE and FINAL with override and final in athena/

athena/extensions/extension_app_model_builder.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/extensions/public/extension_app_model_builder.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/extensions/public/extensions_delegate.h"
 #include "extensions/browser/extension_icon_image.h"
@@ skipping 23 matching lines @@
                     *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
                         IDR_APP_DEFAULT_ICON),
                     NULL) {
     icon_image_.image_skia().EnsureRepsForSupportedScales();
     SetIcon(icon_image_.image_skia(), false);
     SetName(extension->name());
   }
 
  private:
   // Overridden from app_list::AppListItem:
-  virtual void Activate(int event_flags) OVERRIDE {
+  virtual void Activate(int event_flags) override {
     ExtensionsDelegate::Get(browser_context_)->LaunchApp(extension_->id());
   }
 
   scoped_refptr<const extensions::Extension> extension_;
   content::BrowserContext* browser_context_;
   extensions::IconImage icon_image_;
 
   DISALLOW_COPY_AND_ASSIGN(AppItem);
 };
 
@@ skipping 15 matching lines @@
        ++iter) {
     // TODO(mukai): use chrome/browser/extension_ui_util.
     if ((*iter)->ShouldDisplayInAppLauncher()) {
       model->AddItem(scoped_ptr<app_list::AppListItem>(
           new AppItem(*iter, browser_context_)));
     }
   }
 }
 
 }  // namespace athena