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

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

Issue 536013002: Decoupling visibility states from webcontent, adding visibility management in ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed 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_unittest.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/activity_manager_impl.h" 5 #include "athena/activity/activity_manager_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "athena/activity/public/activity.h" 9 #include "athena/activity/public/activity.h"
10 #include "athena/activity/public/activity_manager_observer.h" 10 #include "athena/activity/public/activity_manager_observer.h"
11 #include "athena/activity/public/activity_view_manager.h" 11 #include "athena/activity/public/activity_view_manager.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/observer_list.h" 13 #include "base/observer_list.h"
14 14
15 namespace athena { 15 namespace athena {
16 16
17 namespace { 17 namespace {
18 18
19 ActivityManager* instance = NULL; 19 ActivityManager* instance = NULL;
20 20
21 } // namespace 21 } // namespace
22 22
23 ActivityManagerImpl::ActivityManagerImpl() { 23 ActivityManagerImpl::ActivityManagerImpl() {
24 CHECK(!instance); 24 CHECK(!instance);
25 instance = this; 25 instance = this;
26 } 26 }
27 27
28 ActivityManagerImpl::~ActivityManagerImpl() { 28 ActivityManagerImpl::~ActivityManagerImpl() {
29 while (!activities_.empty()) 29 while (!activities_.empty())
30 delete activities_.front(); 30 Activity::Delete(activities_.front());
31 31
32 CHECK_EQ(this, instance); 32 CHECK_EQ(this, instance);
33 instance = NULL; 33 instance = NULL;
34 } 34 }
35 35
36 void ActivityManagerImpl::AddActivity(Activity* activity) { 36 void ActivityManagerImpl::AddActivity(Activity* activity) {
37 CHECK(activities_.end() == 37 CHECK(activities_.end() ==
38 std::find(activities_.begin(), activities_.end(), activity)); 38 std::find(activities_.begin(), activities_.end(), activity));
39 activities_.push_back(activity); 39 activities_.push_back(activity);
40 ActivityViewManager* manager = ActivityViewManager::Get(); 40 ActivityViewManager* manager = ActivityViewManager::Get();
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 } 84 }
85 85
86 void ActivityManager::Shutdown() { 86 void ActivityManager::Shutdown() {
87 CHECK(instance); 87 CHECK(instance);
88 delete instance; 88 delete instance;
89 ActivityViewManager::Shutdown(); 89 ActivityViewManager::Shutdown();
90 } 90 }
91 91
92 92
93 } // namespace athena 93 } // namespace athena
OLDNEW
« no previous file with comments | « athena/activity/activity.cc ('k') | athena/activity/activity_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698