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

Side by Side Diff: athena/content/app_registry_impl.cc

Issue 653563004: NULL -> nullptr under athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 2 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
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/content/public/app_registry.h" 5 #include "athena/content/public/app_registry.h"
6 6
7 #include "athena/content/app_activity_registry.h" 7 #include "athena/content/app_activity_registry.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 9
10 namespace athena { 10 namespace athena {
(...skipping 13 matching lines...) Expand all
24 virtual void RemoveAppActivityRegistry( 24 virtual void RemoveAppActivityRegistry(
25 AppActivityRegistry* registry) override; 25 AppActivityRegistry* registry) override;
26 26
27 std::vector<AppActivityRegistry*> app_list_; 27 std::vector<AppActivityRegistry*> app_list_;
28 28
29 DISALLOW_COPY_AND_ASSIGN(AppRegistryImpl); 29 DISALLOW_COPY_AND_ASSIGN(AppRegistryImpl);
30 }; 30 };
31 31
32 namespace { 32 namespace {
33 33
34 AppRegistryImpl* instance = NULL; 34 AppRegistryImpl* instance = nullptr;
35 35
36 } // namespace 36 } // namespace
37 37
38 AppRegistryImpl::AppRegistryImpl() { 38 AppRegistryImpl::AppRegistryImpl() {
39 } 39 }
40 AppRegistryImpl::~AppRegistryImpl() { 40 AppRegistryImpl::~AppRegistryImpl() {
41 DCHECK(app_list_.empty()); 41 DCHECK(app_list_.empty());
42 } 42 }
43 43
44 AppActivityRegistry* AppRegistryImpl::GetAppActivityRegistry( 44 AppActivityRegistry* AppRegistryImpl::GetAppActivityRegistry(
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 // static 82 // static
83 void AppRegistry::ShutDown() { 83 void AppRegistry::ShutDown() {
84 DCHECK(instance); 84 DCHECK(instance);
85 delete instance; 85 delete instance;
86 } 86 }
87 87
88 AppRegistry::AppRegistry() {} 88 AppRegistry::AppRegistry() {}
89 89
90 AppRegistry::~AppRegistry() { 90 AppRegistry::~AppRegistry() {
91 instance = NULL; 91 instance = nullptr;
92 } 92 }
93 93
94 } // namespace athena 94 } // namespace athena
OLDNEW
« no previous file with comments | « athena/content/app_activity_unittest.cc ('k') | athena/content/chrome/web_activity_helpers_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698