webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 8 insertions, 8 deletions

diff --git a/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h b/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h
index bc0302957..e5360f8d4 100644
--- a/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h
+++ b/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h
@@ -23,12 +23,11 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef PluginModuleInfo_h
-#define PluginModuleInfo_h
+#pragma once
 
 #include <WebCore/PluginData.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 #include <mach/machine.h>
 #endif
 
@@ -43,22 +42,23 @@ enum PluginModuleLoadPolicy {
 
     // The plug-in should be blocked from being instantiated.
     // Note that the plug-in will still be seen by e.g. navigator.plugins
-    PluginModuleBlocked,
+    PluginModuleBlockedForSecurity,
+    PluginModuleBlockedForCompatibility,
 };
 
 struct PluginModuleInfo {
     String path;
     WebCore::PluginInfo info;
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     cpu_type_t pluginArchitecture;
     String bundleIdentifier;
     String versionString;
     String shortVersionString;
-    String preferencePanePath;
+    bool hasSandboxProfile;
+#elif PLATFORM(GTK)
+    bool requiresGtk2;
 #endif
 };
 
 } // namespace WebKit
-
-#endif // PluginModuleInfo_h