Chromium Code Reviews| Index: chrome/browser/content_settings/host_content_settings_map.cc |
| diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc |
| index 133e66fac475f09c0df8b34b0f0652825cafd630..64562cbc868dcfe5820888729edb507a883a70b0 100644 |
| --- a/chrome/browser/content_settings/host_content_settings_map.cc |
| +++ b/chrome/browser/content_settings/host_content_settings_map.cc |
| @@ -1,4 +1,4 @@ |
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| @@ -9,6 +9,7 @@ |
| #include "base/utf_string_conversions.h" |
| #include "chrome/browser/browser_thread.h" |
| #include "chrome/browser/content_settings/content_settings_details.h" |
| +#include "chrome/browser/content_settings/content_settings_provider.h" |
| #include "chrome/browser/content_settings/policy_content_settings_provider.h" |
| #include "chrome/browser/content_settings/pref_content_settings_provider.h" |
| #include "chrome/browser/metrics/user_metrics.h" |
| @@ -87,11 +88,12 @@ ContentSetting ClickToPlayFixup(ContentSettingsType content_type, |
| return setting; |
| } |
| -typedef std::vector<linked_ptr<ContentSettingsProviderInterface> >::iterator |
| +typedef linked_ptr<DefaultContentSettingsProvider> |
| + DefaultContentSettingsProviderPtr; |
| +typedef std::vector<DefaultContentSettingsProviderPtr>::iterator |
| provider_iterator; |
| -typedef |
| - std::vector<linked_ptr<ContentSettingsProviderInterface> >::const_iterator |
| - const_provider_iterator; |
| +typedef std::vector<DefaultContentSettingsProviderPtr>::const_iterator |
| + const_provider_iterator; |
| } // namespace |
| @@ -111,10 +113,10 @@ HostContentSettingsMap::HostContentSettingsMap(Profile* profile) |
| // as providers that are further down in the list (i.e. added later) override |
| // providers further up. |
| content_settings_providers_.push_back( |
| - linked_ptr<ContentSettingsProviderInterface>( |
| + linked_ptr<DefaultContentSettingsProvider>( |
|
jochen (gone - plz use gerrit)
2011/01/25 14:31:55
DefaultContentSettingsProviderPtr
markusheintz_
2011/01/25 14:46:22
Done.
|
| new PrefContentSettingsProvider(profile))); |
| content_settings_providers_.push_back( |
| - linked_ptr<ContentSettingsProviderInterface>( |
| + linked_ptr<DefaultContentSettingsProvider>( |
| new PolicyContentSettingsProvider(profile))); |
| PrefService* prefs = profile_->GetPrefs(); |