summaryrefslogtreecommitdiffstats
path: root/o3d/plugin
diff options
context:
space:
mode:
Diffstat (limited to 'o3d/plugin')
-rw-r--r--o3d/plugin/cross/config_common.cc2
-rw-r--r--o3d/plugin/cross/main.h4
-rw-r--r--o3d/plugin/cross/o3d_glue.cc8
-rw-r--r--o3d/plugin/cross/o3d_glue.h2
-rw-r--r--o3d/plugin/cross/stream_manager.cc2
-rw-r--r--o3d/plugin/idl/codegen.py4
-rw-r--r--o3d/plugin/idl/idl.gyp2
-rw-r--r--o3d/plugin/npapi_host_control/build.scons1
-rw-r--r--o3d/plugin/npapi_host_control/win/dispatch_proxy.h2
-rw-r--r--o3d/plugin/npapi_host_control/win/np_browser_proxy.h2
-rw-r--r--o3d/plugin/npapi_host_control/win/np_object_proxy.cc2
-rw-r--r--o3d/plugin/npapi_host_control/win/np_object_proxy.h2
-rw-r--r--o3d/plugin/npapi_host_control/win/np_plugin_proxy.h2
-rw-r--r--o3d/plugin/npapi_host_control/win/stream_operation.h2
-rw-r--r--o3d/plugin/win/config.cc2
15 files changed, 20 insertions, 19 deletions
diff --git a/o3d/plugin/cross/config_common.cc b/o3d/plugin/cross/config_common.cc
index 180443c..7ed7965a 100644
--- a/o3d/plugin/cross/config_common.cc
+++ b/o3d/plugin/cross/config_common.cc
@@ -48,7 +48,7 @@
#include "plugin/cross/config.h"
#include "plugin/cross/o3d_glue.h"
#include "core/cross/error.h"
-#include "third_party/nixysa/files/static_glue/npapi/common.h"
+#include "third_party/nixysa/static_glue/npapi/common.h"
using glue::_o3d::GetServiceLocator;
diff --git a/o3d/plugin/cross/main.h b/o3d/plugin/cross/main.h
index c5de7b6..29e386a 100644
--- a/o3d/plugin/cross/main.h
+++ b/o3d/plugin/cross/main.h
@@ -52,8 +52,8 @@
#include "plugin/cross/o3d_glue.h"
#include "plugin/cross/config.h"
#include "plugin/cross/stream_manager.h"
-#include "third_party/nixysa/files/static_glue/npapi/common.h"
-#include "third_party/nixysa/files/static_glue/npapi/npn_api.h"
+#include "third_party/nixysa/static_glue/npapi/common.h"
+#include "third_party/nixysa/static_glue/npapi/npn_api.h"
#if defined(O3D_INTERNAL_PLUGIN)
#define HANDLE_CRASHES void(0)
diff --git a/o3d/plugin/cross/o3d_glue.cc b/o3d/plugin/cross/o3d_glue.cc
index 65912ba..47331ff 100644
--- a/o3d/plugin/cross/o3d_glue.cc
+++ b/o3d/plugin/cross/o3d_glue.cc
@@ -45,7 +45,7 @@
#include "plugin/cross/stream_manager.h"
#include "client_glue.h"
#include "globals_glue.h"
-#include "third_party/nixysa/files/static_glue/npapi/common.h"
+#include "third_party/nixysa/static_glue/npapi/common.h"
#ifdef OS_MACOSX
#include "plugin_mac.h"
@@ -850,9 +850,9 @@ void PluginObject::AsyncTick() {
// message handler.
// If NPN_PluginThreadAsyncCall worked in more browsers, it would be simpler
// to use that.
- // We're calling LoadURL here with a URL that will return 0 bytes on browsers
- // that support the "data:" protocol and fail in browsers that don't like IE.
- // On browsers that support it, the side effect is to call the TickCallback.
+ // We're calling LoadURL here with a URL that will return 0 bytes on browsers
+ // that support the "data:" protocol and fail in browsers that don't like IE.
+ // On browsers that support it, the side effect is to call the TickCallback.
if (!stream_manager_->LoadURL("data:,", NULL, NULL, NULL,
new TickCallback(this), NP_NORMAL)) {
// Fallback on synchronous call if asynchronous load fails.
diff --git a/o3d/plugin/cross/o3d_glue.h b/o3d/plugin/cross/o3d_glue.h
index e67d8e6..c61d1d9 100644
--- a/o3d/plugin/cross/o3d_glue.h
+++ b/o3d/plugin/cross/o3d_glue.h
@@ -66,7 +66,7 @@
#include "core/cross/profiler.h"
#include "plugin/cross/np_v8_bridge.h"
#include "client_glue.h"
-#include "third_party/nixysa/files/static_glue/npapi/common.h"
+#include "third_party/nixysa/static_glue/npapi/common.h"
namespace o3d {
class Client;
diff --git a/o3d/plugin/cross/stream_manager.cc b/o3d/plugin/cross/stream_manager.cc
index 07f25a2..48da1c1 100644
--- a/o3d/plugin/cross/stream_manager.cc
+++ b/o3d/plugin/cross/stream_manager.cc
@@ -37,7 +37,7 @@
#include "base/logging.h"
#include "plugin/cross/o3d_glue.h"
-#include "third_party/nixysa/files/static_glue/npapi/common.h"
+#include "third_party/nixysa/static_glue/npapi/common.h"
namespace glue {
diff --git a/o3d/plugin/idl/codegen.py b/o3d/plugin/idl/codegen.py
index 8f029bf..329c797 100644
--- a/o3d/plugin/idl/codegen.py
+++ b/o3d/plugin/idl/codegen.py
@@ -23,7 +23,7 @@ import os.path
third_party = os.path.join('..', '..', '..', 'third_party')
pythonpath = os.pathsep.join([os.path.join(third_party, 'gflags', 'python'),
- os.path.join(third_party, 'ply', 'files')])
+ os.path.join(third_party, 'ply')])
orig_pythonpath = os.environ.get('PYTHONPATH')
if orig_pythonpath:
@@ -31,6 +31,6 @@ if orig_pythonpath:
os.environ['PYTHONPATH'] = pythonpath
-nixysa = os.path.join(third_party, 'nixysa', 'files', 'codegen.py')
+nixysa = os.path.join(third_party, 'nixysa', 'codegen.py')
status = subprocess.call([sys.executable, nixysa] + sys.argv[1:])
sys.exit(status)
diff --git a/o3d/plugin/idl/idl.gyp b/o3d/plugin/idl/idl.gyp
index 9f3a277..5a7b22c 100644
--- a/o3d/plugin/idl/idl.gyp
+++ b/o3d/plugin/idl/idl.gyp
@@ -9,7 +9,7 @@
'variables': {
'chromium_code': 0,
'idl_out_dir': '<(SHARED_INTERMEDIATE_DIR)/idl_glue',
- 'static_glue_dir': '../../../third_party/nixysa/files/static_glue/npapi',
+ 'static_glue_dir': '../../../third_party/nixysa/static_glue/npapi',
'idl_files': [
'archive_request.idl',
'bitmap.idl',
diff --git a/o3d/plugin/npapi_host_control/build.scons b/o3d/plugin/npapi_host_control/build.scons
index a53383f..5852d58 100644
--- a/o3d/plugin/npapi_host_control/build.scons
+++ b/o3d/plugin/npapi_host_control/build.scons
@@ -43,6 +43,7 @@ env.Append(
CPPPATH = [
'win',
'$SCONSTRUCT_DIR/plugin/npapi_host_control/win',
+ '$NPAPI_DIR',
],
LIBS = [
'wininet',
diff --git a/o3d/plugin/npapi_host_control/win/dispatch_proxy.h b/o3d/plugin/npapi_host_control/win/dispatch_proxy.h
index bb12cc8..64209ec 100644
--- a/o3d/plugin/npapi_host_control/win/dispatch_proxy.h
+++ b/o3d/plugin/npapi_host_control/win/dispatch_proxy.h
@@ -39,7 +39,7 @@
#include <atlctl.h>
#include <dispex.h>
-#include "third_party/npapi/files/include/npupp.h"
+#include "third_party/npapi/include/npupp.h"
#include "plugin/npapi_host_control/win/np_browser_proxy.h"
class NPBrowserProxy;
diff --git a/o3d/plugin/npapi_host_control/win/np_browser_proxy.h b/o3d/plugin/npapi_host_control/win/np_browser_proxy.h
index 19f3245..e245c84 100644
--- a/o3d/plugin/npapi_host_control/win/np_browser_proxy.h
+++ b/o3d/plugin/npapi_host_control/win/np_browser_proxy.h
@@ -47,7 +47,7 @@
#include <dispex.h>
#include <map>
-#include "third_party/npapi/files/include/npupp.h"
+#include "third_party/npapi/include/npupp.h"
#include "plugin/npapi_host_control/win/dispatch_proxy.h"
#include "plugin/npapi_host_control/win/np_object_proxy.h"
diff --git a/o3d/plugin/npapi_host_control/win/np_object_proxy.cc b/o3d/plugin/npapi_host_control/win/np_object_proxy.cc
index da7f018..e75b421 100644
--- a/o3d/plugin/npapi_host_control/win/np_object_proxy.cc
+++ b/o3d/plugin/npapi_host_control/win/np_object_proxy.cc
@@ -38,7 +38,7 @@
#include "plugin/npapi_host_control/win/np_object_proxy.h"
#include "plugin/npapi_host_control/win/np_browser_proxy.h"
#include "plugin/npapi_host_control/win/variant_utils.h"
-#include "third_party/npapi/files/include/npupp.h"
+#include "third_party/npapi/include/npupp.h"
namespace {
diff --git a/o3d/plugin/npapi_host_control/win/np_object_proxy.h b/o3d/plugin/npapi_host_control/win/np_object_proxy.h
index 4d80676..4cf20c8 100644
--- a/o3d/plugin/npapi_host_control/win/np_object_proxy.h
+++ b/o3d/plugin/npapi_host_control/win/np_object_proxy.h
@@ -44,7 +44,7 @@
// type-lib.
#include "npapi_host_control.h"
-#include "third_party/npapi/files/include/npupp.h"
+#include "third_party/npapi/include/npupp.h"
struct NPObject;
class NPBrowserProxy;
diff --git a/o3d/plugin/npapi_host_control/win/np_plugin_proxy.h b/o3d/plugin/npapi_host_control/win/np_plugin_proxy.h
index 0c81367..6f122d1 100644
--- a/o3d/plugin/npapi_host_control/win/np_plugin_proxy.h
+++ b/o3d/plugin/npapi_host_control/win/np_plugin_proxy.h
@@ -37,7 +37,7 @@
#define O3D_PLUGIN_NPAPI_HOST_CONTROL_WIN_NP_PLUGIN_PROXY_H_
#include <vector>
-#include "third_party/npapi/files/include/npupp.h"
+#include "third_party/npapi/include/npupp.h"
class NPBrowserProxy;
struct INPObjectProxy;
diff --git a/o3d/plugin/npapi_host_control/win/stream_operation.h b/o3d/plugin/npapi_host_control/win/stream_operation.h
index c74f436..25f35cb 100644
--- a/o3d/plugin/npapi_host_control/win/stream_operation.h
+++ b/o3d/plugin/npapi_host_control/win/stream_operation.h
@@ -49,7 +49,7 @@
#include <atlstr.h>
#include <urlmon.h>
-#include "third_party/npapi/files/include/npupp.h"
+#include "third_party/npapi/include/npupp.h"
class NPPluginProxy;
diff --git a/o3d/plugin/win/config.cc b/o3d/plugin/win/config.cc
index e47147a..9be4c5c 100644
--- a/o3d/plugin/win/config.cc
+++ b/o3d/plugin/win/config.cc
@@ -55,7 +55,7 @@
#include "plugin/cross/config.h"
#include "plugin/cross/plugin_metrics.h"
#include "core/cross/install_check.h"
-#include "third_party/nixysa/files/static_glue/npapi/common.h"
+#include "third_party/nixysa/static_glue/npapi/common.h"
namespace o3d {
generated by cgit v1.1 at 2025-02-01 23:46:32 +0000