diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 06:03:44 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 06:03:44 +0000 |
| commit | 38789d8b022117628f26ddf3d4abe9c47c98d574 (patch) | |
| tree | bfd1d1446a3e8c7409d687597db0db3831c19e5e /chrome/browser/gears_integration.cc | |
| parent | d978840b3799a139f284c413ffe79b03944afa5e (diff) | |
| download | chromium_src-38789d8b022117628f26ddf3d4abe9c47c98d574.zip chromium_src-38789d8b022117628f26ddf3d4abe9c47c98d574.tar.gz chromium_src-38789d8b022117628f26ddf3d4abe9c47c98d574.tar.bz2 | |
Revert "Revert "Implement web app definition parsing.""
This reverts commit 8d410ce0aae7acbbcd816425ba49e79d8d7b9a1d.
TBR=aa@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gears_integration.cc')
| -rw-r--r-- | chrome/browser/gears_integration.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/gears_integration.cc b/chrome/browser/gears_integration.cc index d1f13cf..1ab162a 100644 --- a/chrome/browser/gears_integration.cc +++ b/chrome/browser/gears_integration.cc @@ -15,10 +15,10 @@ #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. @@ -139,7 +139,7 @@ class CreateShortcutCommand : public CPCommandInterface { 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), @@ -157,7 +157,7 @@ class CreateShortcutCommand : public CPCommandInterface { 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); @@ -232,7 +232,7 @@ class CreateShortcutCommand : public CPCommandInterface { 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, |