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

Unified Diff: chrome/common/render_messages_internal.h

Issue 3717005: This adds a plugin selection policy for selecting allowed plugins (Closed)
Patch Set: fix win build Created 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/common/render_messages_internal.h
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 62a0b88815792a08438bfff4af987eab598fa374..1307799349e1b5420ae971764513ae3e8de6bd2c 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -1367,31 +1367,34 @@ IPC_BEGIN_MESSAGES(ViewHost)
std::vector<WebPluginInfo> /* plugins */)
// Return information about a plugin for the given URL and MIME
- // type. If there is no matching plugin, |info| is an empty vector.
- // If |enabled| in the WebPluginInfo struct is false, the plug-in is
- // basically treated as if it was not installed at all.
- // |settings| has an entry for each item in |info|.
- // If the corresponding |settings| array element 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 the corresponding |settings| array element 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 the corresponding |settings| array element 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_types| is a list of actual mime types supported by
- // each plugin found that match the URL given (one for each item in |info|).
- IPC_SYNC_MESSAGE_CONTROL3_3(ViewHostMsg_GetPluginInfoArray,
+ // 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.
+ //
+ // 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_CONTROL3_4(ViewHostMsg_GetPluginInfo,
GURL /* url */,
GURL /* policy_url */,
std::string /* mime_type */,
- std::vector<WebPluginInfo> /* plugin info */,
- std::vector<ContentSetting> /* settings */,
- std::vector<std::string> /* actual_mime_types */)
+ bool /* found */,
+ WebPluginInfo /* plugin info */,
+ ContentSetting /* setting */,
+ std::string /* actual_mime_type */)
// Requests spellcheck for a word.
IPC_SYNC_MESSAGE_ROUTED2_2(ViewHostMsg_SpellCheck,
@@ -1529,10 +1532,9 @@ IPC_BEGIN_MESSAGES(ViewHost)
// create a plugin. The browser will create the plugin process if
// necessary, and will return a handle to the channel on success.
// On error an empty string is returned.
- IPC_SYNC_MESSAGE_CONTROL3_2(ViewHostMsg_OpenChannelToPlugin,
+ IPC_SYNC_MESSAGE_CONTROL2_2(ViewHostMsg_OpenChannelToPlugin,
GURL /* url */,
std::string /* mime_type */,
- std::string /* locale */,
IPC::ChannelHandle /* handle to channel */,
WebPluginInfo /* info */)

Powered by Google App Engine
This is Rietveld 408576698