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

Side by Side Diff: chrome/browser/content_settings/host_content_settings_map.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/host_content_settings_map.h" 5 #include "chrome/browser/content_settings/host_content_settings_map.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 96
97 content_settings::ObservableProvider* policy_provider = 97 content_settings::ObservableProvider* policy_provider =
98 new content_settings::PolicyProvider(prefs_); 98 new content_settings::PolicyProvider(prefs_);
99 policy_provider->AddObserver(this); 99 policy_provider->AddObserver(this);
100 content_settings_providers_[POLICY_PROVIDER] = policy_provider; 100 content_settings_providers_[POLICY_PROVIDER] = policy_provider;
101 101
102 if (extension_service) { 102 if (extension_service) {
103 // |extension_service| can be NULL in unit tests. 103 // |extension_service| can be NULL in unit tests.
104 content_settings::ObservableProvider* extension_provider = 104 content_settings::ObservableProvider* extension_provider =
105 new content_settings::ExtensionProvider( 105 new content_settings::ExtensionProvider(
106 extension_service->GetExtensionContentSettingsStore(), 106 extension_service->GetContentSettingsStore(),
107 is_off_the_record_); 107 is_off_the_record_);
108 extension_provider->AddObserver(this); 108 extension_provider->AddObserver(this);
109 content_settings_providers_[EXTENSION_PROVIDER] = extension_provider; 109 content_settings_providers_[EXTENSION_PROVIDER] = extension_provider;
110 } 110 }
111 111
112 content_settings::ObservableProvider* pref_provider = 112 content_settings::ObservableProvider* pref_provider =
113 new content_settings::PrefProvider(prefs_, is_off_the_record_); 113 new content_settings::PrefProvider(prefs_, is_off_the_record_);
114 pref_provider->AddObserver(this); 114 pref_provider->AddObserver(this);
115 content_settings_providers_[PREF_PROVIDER] = pref_provider; 115 content_settings_providers_[PREF_PROVIDER] = pref_provider;
116 116
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 } 467 }
468 } 468 }
469 469
470 if (info) { 470 if (info) {
471 info->source = content_settings::SETTING_SOURCE_NONE; 471 info->source = content_settings::SETTING_SOURCE_NONE;
472 info->primary_pattern = ContentSettingsPattern(); 472 info->primary_pattern = ContentSettingsPattern();
473 info->secondary_pattern = ContentSettingsPattern(); 473 info->secondary_pattern = ContentSettingsPattern();
474 } 474 }
475 return NULL; 475 return NULL;
476 } 476 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698