Move extension messages to their own file and add a RenderViewObserver to start moving the extens...

chrome/common/render_messages_params.cc

Index: chrome/common/render_messages_params.cc
===================================================================
--- chrome/common/render_messages_params.cc	(revision 79468)
+++ chrome/common/render_messages_params.cc	(working copy)
@@ -4,117 +4,10 @@
 
 #include "chrome/common/render_messages_params.h"
 
-#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/render_messages.h"
 
-ViewMsg_ExecuteCode_Params::ViewMsg_ExecuteCode_Params() {
-}
-
-ViewMsg_ExecuteCode_Params::ViewMsg_ExecuteCode_Params(
-    int request_id,
-    const std::string& extension_id,
-    bool is_javascript,
-    const std::string& code,
-    bool all_frames)
-    : request_id(request_id), extension_id(extension_id),
-      is_javascript(is_javascript),
-      code(code), all_frames(all_frames) {
-}
-
-ViewMsg_ExecuteCode_Params::~ViewMsg_ExecuteCode_Params() {
-}
-
-ViewHostMsg_DomMessage_Params::ViewHostMsg_DomMessage_Params()
-    : request_id(0),
-      has_callback(false),
-      user_gesture(false) {
-}
-
-ViewHostMsg_DomMessage_Params::~ViewHostMsg_DomMessage_Params() {
-}
-
-ViewMsg_ExtensionLoaded_Params::ViewMsg_ExtensionLoaded_Params()
-    : location(Extension::INVALID) {
-}
-
-ViewMsg_ExtensionLoaded_Params::~ViewMsg_ExtensionLoaded_Params() {
-}
-
-ViewMsg_ExtensionLoaded_Params::ViewMsg_ExtensionLoaded_Params(
-    const ViewMsg_ExtensionLoaded_Params& other)
-    : manifest(other.manifest->DeepCopy()),
-      location(other.location),
-      path(other.path),
-      id(other.id) {
-}
-
-ViewMsg_ExtensionLoaded_Params::ViewMsg_ExtensionLoaded_Params(
-    const Extension* extension)
-    : manifest(new DictionaryValue()),
-      location(extension->location()),
-      path(extension->path()),
-      id(extension->id()) {
-  // As we need more bits of extension data in the renderer, add more keys to
-  // this list.
-  const char* kRendererExtensionKeys[] = {
-    extension_manifest_keys::kPublicKey,
-    extension_manifest_keys::kName,
-    extension_manifest_keys::kVersion,
-    extension_manifest_keys::kIcons,
-    extension_manifest_keys::kPermissions,
-    extension_manifest_keys::kApp
-  };
-
-  // Copy only the data we need.
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kRendererExtensionKeys); ++i) {
-    Value* temp = NULL;
-    if (extension->manifest_value()->Get(kRendererExtensionKeys[i], &temp))
-      manifest->Set(kRendererExtensionKeys[i], temp->DeepCopy());
-  }
-}
-
-scoped_refptr<Extension>
-    ViewMsg_ExtensionLoaded_Params::ConvertToExtension() const {
-  // Extensions that are loaded unpacked won't have a key.
-  const bool kRequireKey = false;
-
-  // The extension may have been loaded in a way that does not require
-  // strict error checks to pass.  Do not do strict checks here.
-  const bool kStrictErrorChecks = false;
-  std::string error;
-
-  scoped_refptr<Extension> extension(
-      Extension::Create(path, location, *manifest, kRequireKey,
-                        kStrictErrorChecks, &error));
-  if (!extension.get())
-    LOG(ERROR) << "Error deserializing extension: " << error;
-
-  return extension;
-}
-
 namespace IPC {
 
-template <>
-struct ParamTraits<Extension::Location> {
-  typedef Extension::Location param_type;
-  static void Write(Message* m, const param_type& p) {
-    int val = static_cast<int>(p);
-    WriteParam(m, val);
-  }
-  static bool Read(const Message* m, void** iter, param_type* p) {
-    int val = 0;
-    if (!ReadParam(m, iter, &val) ||
-        val < Extension::INVALID ||
-        val >= Extension::NUM_LOCATIONS)
-      return false;
-    *p = static_cast<param_type>(val);
-    return true;
-  }
-  static void Log(const param_type& p, std::string* l) {
-    ParamTraits<int>::Log(static_cast<int>(p), l);
-  }
-};
-
 void ParamTraits<ViewHostMsg_PageHasOSDD_Type>::Write(Message* m,
                                                       const param_type& p) {
   m->WriteInt(p.type);
@@ -192,89 +85,4 @@
   LogParam(state, l);
 }
 
-void ParamTraits<ViewMsg_ExecuteCode_Params>::Write(Message* m,
-                                                    const param_type& p) {
-  WriteParam(m, p.request_id);
-  WriteParam(m, p.extension_id);
-  WriteParam(m, p.is_javascript);
-  WriteParam(m, p.code);
-  WriteParam(m, p.all_frames);
-}
-
-bool ParamTraits<ViewMsg_ExecuteCode_Params>::Read(const Message* m,
-                                                   void** iter,
-                                                   param_type* p) {
-  return
-      ReadParam(m, iter, &p->request_id) &&
-      ReadParam(m, iter, &p->extension_id) &&
-      ReadParam(m, iter, &p->is_javascript) &&
-      ReadParam(m, iter, &p->code) &&
-      ReadParam(m, iter, &p->all_frames);
-}
-
-void ParamTraits<ViewMsg_ExecuteCode_Params>::Log(const param_type& p,
-                                                  std::string* l) {
-  l->append("<ViewMsg_ExecuteCode_Params>");
-}
-
-void ParamTraits<ViewMsg_ExtensionLoaded_Params>::Write(Message* m,
-                                                        const param_type& p) {
-  WriteParam(m, p.location);
-  WriteParam(m, p.path);
-  WriteParam(m, *(p.manifest));
-}
-
-bool ParamTraits<ViewMsg_ExtensionLoaded_Params>::Read(const Message* m,
-                                                       void** iter,
-                                                       param_type* p) {
-  p->manifest.reset(new DictionaryValue());
-  return ReadParam(m, iter, &p->location) &&
-         ReadParam(m, iter, &p->path) &&
-         ReadParam(m, iter, p->manifest.get());
-}
-
-void ParamTraits<ViewMsg_ExtensionLoaded_Params>::Log(const param_type& p,
-                                                      std::string* l) {
-  l->append(p.id);
-}
-
-void ParamTraits<ViewHostMsg_DomMessage_Params>::Write(Message* m,
-                                                       const param_type& p) {
-  WriteParam(m, p.name);
-  WriteParam(m, p.arguments);
-  WriteParam(m, p.source_url);
-  WriteParam(m, p.request_id);
-  WriteParam(m, p.has_callback);
-  WriteParam(m, p.user_gesture);
-}
-
-bool ParamTraits<ViewHostMsg_DomMessage_Params>::Read(const Message* m,
-                                                      void** iter,
-                                                      param_type* p) {
-  return
-      ReadParam(m, iter, &p->name) &&
-      ReadParam(m, iter, &p->arguments) &&
-      ReadParam(m, iter, &p->source_url) &&
-      ReadParam(m, iter, &p->request_id) &&
-      ReadParam(m, iter, &p->has_callback) &&
-      ReadParam(m, iter, &p->user_gesture);
-}
-
-void ParamTraits<ViewHostMsg_DomMessage_Params>::Log(const param_type& p,
-                                                     std::string* l) {
-  l->append("(");
-  LogParam(p.name, l);
-  l->append(", ");
-  LogParam(p.arguments, l);
-  l->append(", ");
-  LogParam(p.source_url, l);
-  l->append(", ");
-  LogParam(p.request_id, l);
-  l->append(", ");
-  LogParam(p.has_callback, l);
-  l->append(", ");
-  LogParam(p.user_gesture, l);
-  l->append(")");
-}
-
 }  // namespace IPC