replace OVERRIDE and FINAL with override and final in athena/

athena/activity/activity_manager_impl.h

Index: athena/activity/activity_manager_impl.h
diff --git a/athena/activity/activity_manager_impl.h b/athena/activity/activity_manager_impl.h
index d7ddac4cb5cda44966932252dd532d1f5af54970..b8a0fd0fee91782a74eff338ca63890e58c0694b 100644
--- a/athena/activity/activity_manager_impl.h
+++ b/athena/activity/activity_manager_impl.h
@@ -23,15 +23,15 @@ class ActivityManagerImpl : public ActivityManager,
   int num_activities() const { return activities_.size(); }
 
   // ActivityManager:
-  virtual void AddActivity(Activity* activity) OVERRIDE;
-  virtual void RemoveActivity(Activity* activity) OVERRIDE;
-  virtual void UpdateActivity(Activity* activity) OVERRIDE;
-  virtual Activity* GetActivityForWindow(aura::Window* window) OVERRIDE;
-  virtual void AddObserver(ActivityManagerObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(ActivityManagerObserver* observer) OVERRIDE;
+  virtual void AddActivity(Activity* activity) override;
+  virtual void RemoveActivity(Activity* activity) override;
+  virtual void UpdateActivity(Activity* activity) override;
+  virtual Activity* GetActivityForWindow(aura::Window* window) override;
+  virtual void AddObserver(ActivityManagerObserver* observer) override;
+  virtual void RemoveObserver(ActivityManagerObserver* observer) override;
 
   // views::WidgetObserver
-  virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
+  virtual void OnWidgetDestroying(views::Widget* widget) override;
 
  private:
   std::vector<Activity*> activities_;