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

Side by Side Diff: chrome/browser/content_settings/content_settings_utils.h

Issue 8334020: Check for default content setting pattern when requiring user authorization for plug-ins. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 9 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/content_settings/content_settings_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_UTILS_H_ 5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_UTILS_H_
6 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_UTILS_H_ 6 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_UTILS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 bool ParseContentSettingValue(const base::Value* value, 45 bool ParseContentSettingValue(const base::Value* value,
46 ContentSetting* setting); 46 ContentSetting* setting);
47 47
48 PatternPair ParsePatternString(const std::string& pattern_str); 48 PatternPair ParsePatternString(const std::string& pattern_str);
49 49
50 std::string CreatePatternString( 50 std::string CreatePatternString(
51 const ContentSettingsPattern& item_pattern, 51 const ContentSettingsPattern& item_pattern,
52 const ContentSettingsPattern& top_level_frame_pattern); 52 const ContentSettingsPattern& top_level_frame_pattern);
53 53
54 // Caller takes the ownership of the returned |base::Value*|. 54 // Caller takes the ownership of the returned |base::Value*|.
55 base::Value* GetContentSettingValue( 55 base::Value* GetContentSettingValueAndPatterns(
56 RuleIterator* rule_iterator, 56 RuleIterator* rule_iterator,
57 const GURL& primary_url, 57 const GURL& primary_url,
58 const GURL& secondary_url); 58 const GURL& secondary_url,
59 ContentSettingsPattern* primary_pattern,
60 ContentSettingsPattern* secondary_pattern);
59 61
60 ContentSetting GetContentSetting( 62 base::Value* GetContentSettingValueAndPatterns(
61 RuleIterator* rule_iterator, 63 const ProviderInterface* provider,
62 const GURL& primary_url, 64 const GURL& primary_url,
63 const GURL& secondary_url); 65 const GURL& secondary_url,
66 ContentSettingsType content_type,
67 const std::string& resource_identifier,
68 bool include_incognito,
69 ContentSettingsPattern* primary_pattern,
70 ContentSettingsPattern* secondary_pattern);
64 71
65 base::Value* GetContentSettingValue( 72 base::Value* GetContentSettingValue(
66 const ProviderInterface* provider, 73 const ProviderInterface* provider,
67 const GURL& primary_url, 74 const GURL& primary_url,
68 const GURL& secondary_url, 75 const GURL& secondary_url,
69 ContentSettingsType content_type, 76 ContentSettingsType content_type,
70 const std::string& resource_identifier, 77 const std::string& resource_identifier,
71 bool include_incognito); 78 bool include_incognito);
72 79
73 ContentSetting GetContentSetting( 80 ContentSetting GetContentSetting(
74 const ProviderInterface* provider, 81 const ProviderInterface* provider,
75 const GURL& primary_url, 82 const GURL& primary_url,
76 const GURL& secondary_url, 83 const GURL& secondary_url,
77 ContentSettingsType content_type, 84 ContentSettingsType content_type,
78 const std::string& resource_identifier, 85 const std::string& resource_identifier,
79 bool include_incognito); 86 bool include_incognito);
80 87
81 } // namespace content_settings 88 } // namespace content_settings
82 89
83 #endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_UTILS_H_ 90 #endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_UTILS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/content_settings/content_settings_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698