summaryrefslogtreecommitdiffstats
path: root/o3d/plugin/cross
diff options
context:
space:
mode:
Diffstat (limited to 'o3d/plugin/cross')
-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
5 files changed, 9 insertions, 9 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 {