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

Side by Side Diff: chrome/browser/extensions/api/content_settings/content_settings_custom_extension_provider.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/extensions/api/content_settings/content_settings_custom _extension_provider.h" 5 #include "chrome/browser/extensions/api/content_settings/content_settings_custom _extension_provider.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include <memory>
8
8 #include "chrome/browser/extensions/api/content_settings/content_settings_store. h" 9 #include "chrome/browser/extensions/api/content_settings/content_settings_store. h"
9 #include "components/content_settings/core/browser/content_settings_rule.h" 10 #include "components/content_settings/core/browser/content_settings_rule.h"
10 #include "components/content_settings/core/browser/content_settings_utils.h" 11 #include "components/content_settings/core/browser/content_settings_utils.h"
11 #include "components/content_settings/core/common/content_settings_pattern.h" 12 #include "components/content_settings/core/common/content_settings_pattern.h"
12 13
13 namespace content_settings { 14 namespace content_settings {
14 15
15 CustomExtensionProvider::CustomExtensionProvider( 16 CustomExtensionProvider::CustomExtensionProvider(
16 const scoped_refptr<extensions::ContentSettingsStore>& extensions_settings, 17 const scoped_refptr<extensions::ContentSettingsStore>& extensions_settings,
17 bool incognito) 18 bool incognito)
18 : incognito_(incognito), extensions_settings_(extensions_settings) { 19 : incognito_(incognito), extensions_settings_(extensions_settings) {
19 extensions_settings_->AddObserver(this); 20 extensions_settings_->AddObserver(this);
20 } 21 }
21 22
22 CustomExtensionProvider::~CustomExtensionProvider() { 23 CustomExtensionProvider::~CustomExtensionProvider() {
23 } 24 }
24 25
25 scoped_ptr<RuleIterator> CustomExtensionProvider::GetRuleIterator( 26 std::unique_ptr<RuleIterator> CustomExtensionProvider::GetRuleIterator(
26 ContentSettingsType content_type, 27 ContentSettingsType content_type,
27 const ResourceIdentifier& resource_identifier, 28 const ResourceIdentifier& resource_identifier,
28 bool incognito) const { 29 bool incognito) const {
29 return extensions_settings_->GetRuleIterator(content_type, 30 return extensions_settings_->GetRuleIterator(content_type,
30 resource_identifier, 31 resource_identifier,
31 incognito); 32 incognito);
32 } 33 }
33 34
34 bool CustomExtensionProvider::SetWebsiteSetting( 35 bool CustomExtensionProvider::SetWebsiteSetting(
35 const ContentSettingsPattern& primary_pattern, 36 const ContentSettingsPattern& primary_pattern,
(...skipping 15 matching lines...) Expand all
51 if (incognito_ != incognito) 52 if (incognito_ != incognito)
52 return; 53 return;
53 // TODO(markusheintz): Be more concise. 54 // TODO(markusheintz): Be more concise.
54 NotifyObservers(ContentSettingsPattern(), 55 NotifyObservers(ContentSettingsPattern(),
55 ContentSettingsPattern(), 56 ContentSettingsPattern(),
56 CONTENT_SETTINGS_TYPE_DEFAULT, 57 CONTENT_SETTINGS_TYPE_DEFAULT,
57 std::string()); 58 std::string());
58 } 59 }
59 60
60 } // namespace content_settings 61 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698