| Index: athena/activity/activity_manager_impl.h
|
| diff --git a/athena/activity/activity_manager_impl.h b/athena/activity/activity_manager_impl.h
|
| index b8a0fd0fee91782a74eff338ca63890e58c0694b..f34a0bd7affb6f0c4c34c2e74e9d29030923fde8 100644
|
| --- a/athena/activity/activity_manager_impl.h
|
| +++ b/athena/activity/activity_manager_impl.h
|
| @@ -18,20 +18,20 @@ class ActivityManagerImpl : public ActivityManager,
|
| public views::WidgetObserver {
|
| public:
|
| ActivityManagerImpl();
|
| - virtual ~ActivityManagerImpl();
|
| + ~ActivityManagerImpl() override;
|
|
|
| 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;
|
| + void AddActivity(Activity* activity) override;
|
| + void RemoveActivity(Activity* activity) override;
|
| + void UpdateActivity(Activity* activity) override;
|
| + Activity* GetActivityForWindow(aura::Window* window) override;
|
| + void AddObserver(ActivityManagerObserver* observer) override;
|
| + void RemoveObserver(ActivityManagerObserver* observer) override;
|
|
|
| // views::WidgetObserver
|
| - virtual void OnWidgetDestroying(views::Widget* widget) override;
|
| + void OnWidgetDestroying(views::Widget* widget) override;
|
|
|
| private:
|
| std::vector<Activity*> activities_;
|
|
|