summaryrefslogtreecommitdiffstats
path: root/content/child/plugin_param_traits.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-21 21:18:51 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-21 21:18:51 +0000
commitddf75903e284dbc1ce36d8b8dfd6ba7e422128d5 (patch)
treec0a0fd9b530488f07c1dc3ab650c75a272ad05f9 /content/child/plugin_param_traits.cc
parent59db6e39a0763b689be197f207261d7b50a6ab53 (diff)
downloadchromium_src-ddf75903e284dbc1ce36d8b8dfd6ba7e422128d5.zip
chromium_src-ddf75903e284dbc1ce36d8b8dfd6ba7e422128d5.tar.gz
chromium_src-ddf75903e284dbc1ce36d8b8dfd6ba7e422128d5.tar.bz2
Move the npruntime_util.h/.cc files from webkit\glue to content\child.
This is continuation of the ongoing work for bug https://code.google.com/p/chromium/issues/detail?can=2&q=237249 which is splitting chrome.dll into a browser and renderer component due to build issues on Windows. BUG=237249 TBR=jamesr@chromium.org Review URL: https://codereview.chromium.org/17068016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/child/plugin_param_traits.cc')
-rw-r--r--content/child/plugin_param_traits.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/child/plugin_param_traits.cc b/content/child/plugin_param_traits.cc
index f50aecf..dd77979 100644
--- a/content/child/plugin_param_traits.cc
+++ b/content/child/plugin_param_traits.cc
@@ -5,9 +5,9 @@
#include "content/child/plugin_param_traits.h"
#include "base/strings/string_number_conversions.h"
+#include "content/child/npruntime_util.h"
#include "ipc/ipc_message_utils.h"
#include "third_party/WebKit/public/web/WebBindings.h"
-#include "webkit/glue/npruntime_util.h"
#include "webkit/plugins/npapi/plugin_host.h"
namespace content {
@@ -115,13 +115,13 @@ void ParamTraits<NPVariant_Param>::Log(const param_type& p, std::string* l) {
}
void ParamTraits<NPIdentifier_Param>::Write(Message* m, const param_type& p) {
- webkit_glue::SerializeNPIdentifier(p.identifier, m);
+ content::SerializeNPIdentifier(p.identifier, m);
}
bool ParamTraits<NPIdentifier_Param>::Read(const Message* m,
PickleIterator* iter,
param_type* r) {
- return webkit_glue::DeserializeNPIdentifier(iter, &r->identifier);
+ return content::DeserializeNPIdentifier(iter, &r->identifier);
}
void ParamTraits<NPIdentifier_Param>::Log(const param_type& p, std::string* l) {