Implement web app definition parsing.

chrome/browser/extensions/convert_web_app.cc

 // Copyright (c) 2010 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/browser/extensions/convert_web_app.h"
 
 #include <cmath>
 #include <limits>
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/sha2.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/json_value_serializer.h"
+#include "chrome/common/web_apps.h"
 #include "gfx/codec/png_codec.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "webkit/glue/dom_operations.h"
 
 namespace keys = extension_manifest_keys;
 
 using base::Time;
 
 namespace {
 
 const char kIconsDirName[] = "_icons";
 
 // Create the public key for the converted web app.
@@ skipping 35 matching lines @@
   LOG(ERROR) << "stamp: " << stamp;
 
   return base::StringPrintf("%i.%i.%i.%i",
                             create_time_exploded.year,
                             create_time_exploded.month,
                             create_time_exploded.day_of_month,
                             static_cast<uint16>(stamp));
 }
 
 scoped_refptr<Extension> ConvertWebAppToExtension(
-    const webkit_glue::WebApplicationInfo& web_app,
-    const Time& create_time) {
+    const WebApplicationInfo& web_app,
+    const base::Time& create_time) {
   FilePath user_data_temp_dir;
   CHECK(PathService::Get(chrome::DIR_USER_DATA_TEMP, &user_data_temp_dir));
 
   ScopedTempDir temp_dir;
   if (!temp_dir.CreateUniqueTempDirUnderPath(user_data_temp_dir)) {
     LOG(ERROR) << "Could not create temporary directory.";
     return NULL;
   }
 
   // Create the manifest
   scoped_ptr<DictionaryValue> root(new DictionaryValue);
   root->SetString(keys::kPublicKey, GenerateKey(web_app.manifest_url));
   root->SetString(keys::kName, UTF16ToUTF8(web_app.title));
   root->SetString(keys::kVersion, ConvertTimeToExtensionVersion(create_time));
   root->SetString(keys::kDescription, UTF16ToUTF8(web_app.description));
   root->SetString(keys::kLaunchWebURL, web_app.app_url.spec());
 
+  if (web_app.launch_container == "panel") {
+    root->SetString(keys::kLaunchContainer,
+                    extension_manifest_values::kLaunchContainerPanel);
+  }
+
+  // TODO(aa): kConvertedFromWebApp?
+
   // Add the icons.
   DictionaryValue* icons = new DictionaryValue();
   root->Set(keys::kIcons, icons);
   for (size_t i = 0; i < web_app.icons.size(); ++i) {
     std::string size = StringPrintf("%i", web_app.icons[i].width);
     std::string icon_path = StringPrintf("%s/%s.png", kIconsDirName,
                                          size.c_str());
     icons->SetString(size, icon_path);
   }
 
-  // Add the permissions.
+  // Add the permissions. In web apps, these are called 'privileges'.

[Erik does not do reviews, 2010/11/15 19:45:36]

I'm not sure we want to make this change just yet.  In Mozilla's stuff, they
used two different terms ("capabilities" and "privileges"), so it looked like
they hadn't made up their minds.  It seems worthwhile to chat with them before
we change something so we don't have to just go and change it again.

[Aaron Boodman, 2010/11/16 03:44:45]

I decided to land these changes in a different order for unrelated reasons, so I
took the changes to convert_web_app.* out of this CL. But I made this change in
web_apps.*.

   ListValue* permissions = new ListValue();
   root->Set(keys::kPermissions, permissions);
-  for (size_t i = 0; i < web_app.permissions.size(); ++i) {
-    permissions->Append(Value::CreateStringValue(web_app.permissions[i]));
+  for (size_t i = 0; i < web_app.privileges.size(); ++i) {
+    permissions->Append(Value::CreateStringValue(web_app.privileges[i]));
   }
 
   // Add the URLs.
   ListValue* urls = new ListValue();
   root->Set(keys::kWebURLs, urls);
   for (size_t i = 0; i < web_app.urls.size(); ++i) {
     urls->Append(Value::CreateStringValue(web_app.urls[i].spec()));
   }
 
   // Write the manifest.
@@ skipping 34 matching lines @@
   scoped_refptr<Extension> extension = Extension::Create(
       temp_dir.path(), Extension::INTERNAL, *root, false, &error);
   if (!extension) {
     LOG(ERROR) << error;
     return NULL;
   }
 
   temp_dir.Take();  // The caller takes ownership of the directory.
   return extension;
 }