Insert default stylesheet for platform apps.

chrome/common/extensions/extension_messages.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/extension_messages.h"
 
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/common/common_param_traits.h"
 
 ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params()
     : location(Extension::INVALID),
       creation_flags(Extension::NO_FLAGS){}
 
 ExtensionMsg_Loaded_Params::~ExtensionMsg_Loaded_Params() {}
 
 ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params(
     const ExtensionMsg_Loaded_Params& other)
-    : manifest(other.manifest->DeepCopy()),
-      location(other.location),
+    : location(other.location),
       path(other.path),
       apis(other.apis),
       explicit_hosts(other.explicit_hosts),
       scriptable_hosts(other.scriptable_hosts),
       id(other.id),
-      creation_flags(other.creation_flags) {}
+      creation_flags(other.creation_flags) {
+  // ipc_message_utils.h calls resize() on vector, which might briefly
+  // construct a struct missing a valid manifest.
+  if (other.manifest.get()) {
+    manifest.reset(other.manifest->DeepCopy());
+  }
+}
+
+ExtensionMsg_Loaded_Params& ExtensionMsg_Loaded_Params::operator=(

[Aaron Boodman, 2011/11/14 22:48:07]

Hm, yeah, it does seem weird/unfortunate to need both of these.

[miket_OOO, 2011/11/14 23:48:51]

See #crx. mpcomplete suggested using linked_ptr, and indeed it cleaned up the
whole thing.

+    const ExtensionMsg_Loaded_Params& other) {
+  manifest.reset(other.manifest->DeepCopy());
+  location = other.location;
+  path = other.path;
+  apis = other.apis;
+  explicit_hosts = other.explicit_hosts;
+  scriptable_hosts = other.scriptable_hosts;
+  id = other.id;
+  creation_flags = other.creation_flags;
+  return *this;
+}
 
 ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params(
     const Extension* extension)
     : manifest(new DictionaryValue()),
       location(extension->location()),
       path(extension->path()),
       apis(extension->GetActivePermissions()->apis()),
       explicit_hosts(extension->GetActivePermissions()->explicit_hosts()),
       scriptable_hosts(extension->GetActivePermissions()->scriptable_hosts()),
       id(extension->id()),
       creation_flags(extension->creation_flags()) {
   // 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::kApp,
+    extension_manifest_keys::kContentScripts,
+    extension_manifest_keys::kIcons,
     extension_manifest_keys::kName,
-    extension_manifest_keys::kVersion,
-    extension_manifest_keys::kIcons,
     extension_manifest_keys::kPageAction,
     extension_manifest_keys::kPageActions,
     extension_manifest_keys::kPermissions,
-    extension_manifest_keys::kApp,
-    extension_manifest_keys::kContentScripts
+    extension_manifest_keys::kPlatformApp,
+    extension_manifest_keys::kPublicKey,
+    extension_manifest_keys::kVersion,
   };
 
   // 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());
   }
 }
 
@@ skipping 127 matching lines @@
          ReadParam(m, iter, &p->explicit_hosts) &&
          ReadParam(m, iter, &p->scriptable_hosts);
 }
 
 void ParamTraits<ExtensionMsg_Loaded_Params>::Log(const param_type& p,
                                                   std::string* l) {
   l->append(p.id);
 }
 
 }  // namespace IPC