Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(256)

Side by Side Diff: athena/activity/activity_manager_impl.h

Issue 596623005: Do not show the activity widget in ActivityManager::AddActivity (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « athena/activity/activity.cc ('k') | athena/activity/activity_manager_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "athena/activity/public/activity_manager.h" 5 #include "athena/activity/public/activity_manager.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
11 #include "ui/views/widget/widget_observer.h"
11 12
12 namespace athena { 13 namespace athena {
13 14
14 class ActivityManagerObserver; 15 class ActivityManagerObserver;
15 16
16 class ActivityManagerImpl : public ActivityManager { 17 class ActivityManagerImpl : public ActivityManager,
18 public views::WidgetObserver {
17 public: 19 public:
18 ActivityManagerImpl(); 20 ActivityManagerImpl();
19 virtual ~ActivityManagerImpl(); 21 virtual ~ActivityManagerImpl();
20 22
21 int num_activities() const { return activities_.size(); } 23 int num_activities() const { return activities_.size(); }
22 24
23 // ActivityManager: 25 // ActivityManager:
24 virtual void AddActivity(Activity* activity) OVERRIDE; 26 virtual void AddActivity(Activity* activity) OVERRIDE;
25 virtual void RemoveActivity(Activity* activity) OVERRIDE; 27 virtual void RemoveActivity(Activity* activity) OVERRIDE;
26 virtual void UpdateActivity(Activity* activity) OVERRIDE; 28 virtual void UpdateActivity(Activity* activity) OVERRIDE;
27 virtual void AddObserver(ActivityManagerObserver* observer) OVERRIDE; 29 virtual void AddObserver(ActivityManagerObserver* observer) OVERRIDE;
28 virtual void RemoveObserver(ActivityManagerObserver* observer) OVERRIDE; 30 virtual void RemoveObserver(ActivityManagerObserver* observer) OVERRIDE;
29 31
32 // views::WidgetObserver
33 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
34
30 private: 35 private:
31 std::vector<Activity*> activities_; 36 std::vector<Activity*> activities_;
32 37
33 ObserverList<ActivityManagerObserver> observers_; 38 ObserverList<ActivityManagerObserver> observers_;
34 39
35 DISALLOW_COPY_AND_ASSIGN(ActivityManagerImpl); 40 DISALLOW_COPY_AND_ASSIGN(ActivityManagerImpl);
36 }; 41 };
37 42
38 } // namespace athena 43 } // namespace athena
OLDNEW
« no previous file with comments | « athena/activity/activity.cc ('k') | athena/activity/activity_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698