summaryrefslogtreecommitdiffstats
path: root/chrome/plugin
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-18 03:16:18 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-18 03:16:18 +0000
commit8c6add3b6648649eeadb60abdecbf6a1bec01860 (patch)
treed0c04c69b9bd5517fa002d8b11558d8b9f6cc1b9 /chrome/plugin
parent9e473f274287cb8e5e110f43a068a88981e9ea54 (diff)
downloadchromium_src-8c6add3b6648649eeadb60abdecbf6a1bec01860.zip
chromium_src-8c6add3b6648649eeadb60abdecbf6a1bec01860.tar.gz
chromium_src-8c6add3b6648649eeadb60abdecbf6a1bec01860.tar.bz2
Get something in chrome/plugin/ compiling to make Scons happy.
Review URL: http://codereview.chromium.org/20449 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
-rw-r--r--chrome/plugin/npobject_util.cc6
-rw-r--r--chrome/plugin/plugin.scons1
2 files changed, 5 insertions, 2 deletions
diff --git a/chrome/plugin/npobject_util.cc b/chrome/plugin/npobject_util.cc
index f5283f9..e3ba520 100644
--- a/chrome/plugin/npobject_util.cc
+++ b/chrome/plugin/npobject_util.cc
@@ -4,8 +4,11 @@
#include "chrome/plugin/npobject_util.h"
+#if defined(OS_WIN)
#include "chrome/common/plugin_messages.h"
#include "chrome/common/win_util.h"
+#endif
+
#include "chrome/plugin/npobject_proxy.h"
#include "chrome/plugin/plugin_channel_base.h"
#include "webkit/glue/plugins/nphostapi.h"
@@ -124,6 +127,7 @@ bool IsPluginProcess() {
return g_plugin_process;
}
+#if defined(OS_WIN)
void CreateNPIdentifierParam(NPIdentifier id, NPIdentifier_Param* param) {
param->identifier = id;
}
@@ -243,4 +247,4 @@ void CreateNPVariant(const NPVariant_Param& param,
NOTREACHED();
}
}
-
+#endif
diff --git a/chrome/plugin/plugin.scons b/chrome/plugin/plugin.scons
index b0eb5f7..3cf9e84 100644
--- a/chrome/plugin/plugin.scons
+++ b/chrome/plugin/plugin.scons
@@ -66,7 +66,6 @@ if env.Bit('posix'):
'chrome_plugin_host.cc',
'npobject_proxy.cc',
'npobject_stub.cc',
- 'npobject_util.cc',
'plugin_channel.cc',
'plugin_channel_base.cc',
'plugin_main.cc',