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

Side by Side Diff: chrome/browser/content_settings/content_settings_extension_provider.cc

Issue 10381097: Move content settings extension API to content_settings dir. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed conflict Created 8 years, 7 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/content_settings/content_settings_extension_provider.h" 5 #include "chrome/browser/content_settings/content_settings_extension_provider.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "chrome/browser/content_settings/content_settings_utils.h" 8 #include "chrome/browser/content_settings/content_settings_utils.h"
9 #include "chrome/browser/extensions/extension_content_settings_store.h" 9 #include "chrome/browser/extensions/api/content_settings/content_settings_store. h"
10 #include "chrome/common/content_settings_pattern.h" 10 #include "chrome/common/content_settings_pattern.h"
11 11
12 namespace content_settings { 12 namespace content_settings {
13 13
14 ExtensionProvider::ExtensionProvider( 14 ExtensionProvider::ExtensionProvider(
15 ExtensionContentSettingsStore* extensions_settings, 15 extensions::ContentSettingsStore* extensions_settings,
16 bool incognito) 16 bool incognito)
17 : incognito_(incognito), 17 : incognito_(incognito),
18 extensions_settings_(extensions_settings) { 18 extensions_settings_(extensions_settings) {
19 extensions_settings_->AddObserver(this); 19 extensions_settings_->AddObserver(this);
20 } 20 }
21 21
22 ExtensionProvider::~ExtensionProvider() { 22 ExtensionProvider::~ExtensionProvider() {
23 } 23 }
24 24
25 RuleIterator* ExtensionProvider::GetRuleIterator( 25 RuleIterator* ExtensionProvider::GetRuleIterator(
(...skipping 25 matching lines...) Expand all
51 if (incognito_ != incognito) 51 if (incognito_ != incognito)
52 return; 52 return;
53 // TODO(markusheintz): Be more concise. 53 // TODO(markusheintz): Be more concise.
54 NotifyObservers(ContentSettingsPattern(), 54 NotifyObservers(ContentSettingsPattern(),
55 ContentSettingsPattern(), 55 ContentSettingsPattern(),
56 CONTENT_SETTINGS_TYPE_DEFAULT, 56 CONTENT_SETTINGS_TYPE_DEFAULT,
57 std::string()); 57 std::string());
58 } 58 }
59 59
60 } // namespace content_settings 60 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698