| Index: components/content_settings/core/browser/content_settings_utils.h
|
| diff --git a/components/content_settings/core/browser/content_settings_utils.h b/components/content_settings/core/browser/content_settings_utils.h
|
| index 03861991cc8fe855012e5ebebf714db2e7e69404..26efe6bdbdc53acdf38d3d17ca9491b5828c5caa 100644
|
| --- a/components/content_settings/core/browser/content_settings_utils.h
|
| +++ b/components/content_settings/core/browser/content_settings_utils.h
|
| @@ -9,6 +9,7 @@
|
| #include <utility>
|
|
|
| #include "base/compiler_specific.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "components/content_settings/core/common/content_settings.h"
|
| #include "components/content_settings/core/common/content_settings_pattern.h"
|
| #include "components/content_settings/core/common/content_settings_types.h"
|
| @@ -59,6 +60,10 @@ base::Value* GetContentSettingValueAndPatterns(
|
| ContentSettingsPattern* primary_pattern,
|
| ContentSettingsPattern* secondary_pattern);
|
|
|
| +// Returns a |base::Value*| representation of |setting| if |setting| is
|
| +// a valid content setting. Otherwise, returns a nullptr.
|
| +scoped_ptr<base::Value> ContentSettingToValue(ContentSetting setting);
|
| +
|
| base::Value* GetContentSettingValueAndPatterns(
|
| const ProviderInterface* provider,
|
| const GURL& primary_url,
|
|
|