diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 07:29:32 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 07:29:32 +0000 |
| commit | 8093a5439afecec131b78422abdeb7038de6f7a3 (patch) | |
| tree | a2f7dc196c51970186615d10d0a884e18c2b7ae9 /content/common | |
| parent | 697a650a1084ef9c77f9c5675f891d6157f36e99 (diff) | |
| download | chromium_src-8093a5439afecec131b78422abdeb7038de6f7a3.zip chromium_src-8093a5439afecec131b78422abdeb7038de6f7a3.tar.gz chromium_src-8093a5439afecec131b78422abdeb7038de6f7a3.tar.bz2 | |
Get rid of the remaining content settings code in the content module.
Add user data to content::ResourceContext that points to chrome's ProfileIOData. That way when the embedder code is called by content, it can get back to its profile specific data structures like HostContentSettingsMap.
BUG=76793
Review URL: http://codereview.chromium.org/7014025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
| -rw-r--r-- | content/common/view_messages.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/content/common/view_messages.h b/content/common/view_messages.h index 16e07a2..dfbc1be 100644 --- a/content/common/view_messages.h +++ b/content/common/view_messages.h @@ -1489,34 +1489,16 @@ IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_GetPlugins, // type. If there is no matching plugin, |found| is false. If // |enabled| in the WebPluginInfo struct is false, the plug-in is // treated as if it was not installed at all. -// -// TODO(jam): until we get ContentSetting out of content completely, sending it -// as int temporarily so we can move these messages to content. -// -// If |setting| is set to CONTENT_SETTING_BLOCK, the plug-in is -// blocked by the content settings for |policy_url|. It still -// appears in navigator.plugins in Javascript though, and can be -// loaded via click-to-play. -// -// If |setting| is set to CONTENT_SETTING_ALLOW, the domain is -// explicitly white-listed for the plug-in, or the user has chosen -// not to block nonsandboxed plugins. -// -// If |setting| is set to CONTENT_SETTING_DEFAULT, the plug-in is -// neither blocked nor white-listed, which means that it's allowed -// by default and can still be blocked if it's non-sandboxed. -// // |actual_mime_type| is the actual mime type supported by the // plugin found that match the URL given (one for each item in // |info|). -IPC_SYNC_MESSAGE_CONTROL4_4(ViewHostMsg_GetPluginInfo, +IPC_SYNC_MESSAGE_CONTROL4_3(ViewHostMsg_GetPluginInfo, int /* routing_id */, GURL /* url */, GURL /* policy_url */, std::string /* mime_type */, bool /* found */, webkit::npapi::WebPluginInfo /* plugin info */, - int /* setting */, std::string /* actual_mime_type */) // A renderer sends this to the browser process when it wants to |