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

Side by Side Diff: extensions/browser/extension_pref_store.cc

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@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 "extensions/browser/extension_pref_store.h" 5 #include "extensions/browser/extension_pref_store.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "extensions/browser/extension_pref_value_map.h" 8 #include "extensions/browser/extension_pref_value_map.h"
9 9
10 ExtensionPrefStore::ExtensionPrefStore( 10 ExtensionPrefStore::ExtensionPrefStore(
11 ExtensionPrefValueMap* extension_pref_value_map, 11 ExtensionPrefValueMap* extension_pref_value_map,
12 bool incognito_pref_store) 12 bool incognito_pref_store)
13 : extension_pref_value_map_(extension_pref_value_map), 13 : extension_pref_value_map_(extension_pref_value_map),
14 incognito_pref_store_(incognito_pref_store) { 14 incognito_pref_store_(incognito_pref_store) {
15 extension_pref_value_map_->AddObserver(this); 15 extension_pref_value_map_->AddObserver(this);
16 } 16 }
17 17
18 void ExtensionPrefStore::OnInitializationCompleted() { 18 void ExtensionPrefStore::OnInitializationCompleted() {
19 NotifyInitializationCompleted(); 19 NotifyInitializationCompleted();
20 } 20 }
21 21
22 void ExtensionPrefStore::OnPrefValueChanged(const std::string& key) { 22 void ExtensionPrefStore::OnPrefValueChanged(const std::string& key) {
23 CHECK(extension_pref_value_map_); 23 CHECK(extension_pref_value_map_);
24 const base::Value *winner = 24 const base::Value* winner = extension_pref_value_map_->GetEffectivePrefValue(
25 extension_pref_value_map_->GetEffectivePrefValue(key, 25 key, incognito_pref_store_, nullptr);
26 incognito_pref_store_,
27 NULL);
28 if (winner) 26 if (winner)
29 SetValue(key, winner->DeepCopy()); 27 SetValue(key, winner->DeepCopy());
30 else 28 else
31 RemoveValue(key); 29 RemoveValue(key);
32 } 30 }
33 31
34 void ExtensionPrefStore::OnExtensionPrefValueMapDestruction() { 32 void ExtensionPrefStore::OnExtensionPrefValueMapDestruction() {
35 CHECK(extension_pref_value_map_); 33 CHECK(extension_pref_value_map_);
36 extension_pref_value_map_->RemoveObserver(this); 34 extension_pref_value_map_->RemoveObserver(this);
37 extension_pref_value_map_ = NULL; 35 extension_pref_value_map_ = nullptr;
38 } 36 }
39 37
40 ExtensionPrefStore::~ExtensionPrefStore() { 38 ExtensionPrefStore::~ExtensionPrefStore() {
41 if (extension_pref_value_map_) 39 if (extension_pref_value_map_)
42 extension_pref_value_map_->RemoveObserver(this); 40 extension_pref_value_map_->RemoveObserver(this);
43 } 41 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698