summaryrefslogtreecommitdiffstats
path: root/content/browser/renderer_host/java
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-19 02:22:13 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-19 02:22:13 +0000
commitdefa597a110054a72e13ae5ef54b77ceec5c9a3f (patch)
treee757254032650411dc1a5b4b32d8e5e7dc217100 /content/browser/renderer_host/java
parent96d51c626fc60f60f4909afa3b44e6b62f57881c (diff)
downloadchromium_src-defa597a110054a72e13ae5ef54b77ceec5c9a3f.zip
chromium_src-defa597a110054a72e13ae5ef54b77ceec5c9a3f.tar.gz
chromium_src-defa597a110054a72e13ae5ef54b77ceec5c9a3f.tar.bz2
Move npapi related files from content\child to the new content\child\npapi directory.
R=scottmg@chromium.org Review URL: https://codereview.chromium.org/19462016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/java')
-rw-r--r--content/browser/renderer_host/java/java_bridge_channel_host.h2
-rw-r--r--content/browser/renderer_host/java/java_bridge_dispatcher_host.cc4
-rw-r--r--content/browser/renderer_host/java/java_bridge_dispatcher_host.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/renderer_host/java/java_bridge_channel_host.h b/content/browser/renderer_host/java/java_bridge_channel_host.h
index 2f54259..3f3f146 100644
--- a/content/browser/renderer_host/java/java_bridge_channel_host.h
+++ b/content/browser/renderer_host/java/java_bridge_channel_host.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_CHANNEL_HOST_H_
#define CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_CHANNEL_HOST_H_
-#include "content/child/np_channel_base.h"
+#include "content/child/npapi/np_channel_base.h"
namespace content {
diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
index c47414b..eeb8d96 100644
--- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
+++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
@@ -10,8 +10,8 @@
#include "content/browser/renderer_host/java/java_bridge_channel_host.h"
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/child/child_process.h"
-#include "content/child/npobject_stub.h"
-#include "content/child/npobject_util.h" // For CreateNPVariantParam()
+#include "content/child/npapi/npobject_stub.h"
+#include "content/child/npapi/npobject_util.h" // For CreateNPVariantParam()
#include "content/common/java_bridge_messages.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_process_host.h"
diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.h b/content/browser/renderer_host/java/java_bridge_dispatcher_host.h
index 7dbb47a..6d44c39 100644
--- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.h
+++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.h
@@ -9,7 +9,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string16.h"
-#include "content/child/npobject_stub.h"
+#include "content/child/npapi/npobject_stub.h"
#include "content/public/browser/render_view_host_observer.h"
class RouteIDGenerator;