Implement web app definition parsing.

chrome/browser/gears_integration.cc

 // Copyright (c) 2009 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/gears_integration.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_plugin_host.h"
 #include "chrome/common/chrome_plugin_util.h"
 #include "chrome/common/gears_api.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"
 
 // The following 2 helpers are borrowed from the Gears codebase.
 
 const size_t kUserPathComponentMaxChars  = 64;
 
 // Returns true if and only if the char meets the following criteria:
 //
 // - visible ASCII
 // - None of the following characters: / \ : * ? " < > | ; ,
 //
@@ skipping 100 matching lines @@
   return icon_url;
 }
 
 // This class holds and manages the data passed to the
 // GEARSPLUGINCOMMAND_CREATE_SHORTCUT plugin command.
 class CreateShortcutCommand : public CPCommandInterface {
  public:
   CreateShortcutCommand(
       const std::string& name, const std::string& orig_name,
       const std::string& url, const std::string& description,
-      const std::vector<webkit_glue::WebApplicationInfo::IconInfo> &icons,
+      const std::vector<WebApplicationInfo::IconInfo> &icons,
       const SkBitmap& fallback_icon,
       GearsCreateShortcutCallback* callback)
       : name_(name), url_(url), description_(description),
         orig_name_(orig_name), callback_(callback),
         calling_loop_(MessageLoop::current()) {
     // shortcut_data_ has the same lifetime as our strings, so we just
     // point it at their internal data.
     memset(&shortcut_data_, 0, sizeof(shortcut_data_));
     shortcut_data_.name = name_.c_str();
     shortcut_data_.url = url_.c_str();
     shortcut_data_.description = description_.c_str();
     shortcut_data_.orig_name = orig_name_.c_str();
 
     // Search the icons array for Gears-supported sizes and copy the strings.
     bool has_icon = false;
 
     for (size_t i = 0; i < icons.size(); ++i) {
-      const webkit_glue::WebApplicationInfo::IconInfo& icon = icons[i];
+      const WebApplicationInfo::IconInfo& icon = icons[i];
       if (icon.width == 16 && icon.height == 16) {
         has_icon = true;
         InitIcon(SIZE_16x16, icon.url, 16, 16);
       } else if (icon.width == 32 && icon.height == 32) {
         has_icon = true;
         InitIcon(SIZE_32x32, icon.url, 32, 32);
       } else if (icon.width == 48 && icon.height == 48) {
         has_icon = true;
         InitIcon(SIZE_48x48, icon.url, 48, 48);
       } else if (icon.width == 128 && icon.height == 128) {
@@ skipping 54 matching lines @@
   std::string orig_name_;
   scoped_ptr<GearsCreateShortcutCallback> callback_;
   MessageLoop* calling_loop_;
 };
 
 // Allows InvokeLater without adding refcounting.  The object is only deleted
 // when its last InvokeLater is run anyway.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(CreateShortcutCommand);
 
 void GearsCreateShortcut(
-    const webkit_glue::WebApplicationInfo& app_info,
+    const WebApplicationInfo& app_info,
     const string16& fallback_name,
     const GURL& fallback_url,
     const SkBitmap& fallback_icon,
     GearsCreateShortcutCallback* callback) {
   string16 name =
       !app_info.title.empty() ? app_info.title : fallback_name;
   std::string orig_name_utf8 = UTF16ToUTF8(name);
   EnsureStringValidPathComponent(name);
 
   std::string name_utf8 = UTF16ToUTF8(name);
@@ skipping 54 matching lines @@
 struct RunnableMethodTraits<QueryShortcutsCommand> {
   void RetainCallee(QueryShortcutsCommand* command) {}
   void ReleaseCallee(QueryShortcutsCommand* command) {}
 };
 
 void GearsQueryShortcuts(GearsQueryShortcutsCallback* callback) {
   CPHandleCommand(GEARSPLUGINCOMMAND_GET_SHORTCUT_LIST,
       new QueryShortcutsCommand(callback),
       0);
 }