diff options
author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 05:14:15 +0000 |
---|---|---|
committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 05:14:15 +0000 |
commit | 1631f7c651fbc7f4460a852126f545afc5513531 (patch) | |
tree | 7176f3052f69c0c0debf48172d533f9acc4c83d3 /chrome/browser/gears_integration.cc | |
parent | 42a17153ee389574560b91b185bcec6c4db5b5c3 (diff) | |
download | chromium_src-1631f7c651fbc7f4460a852126f545afc5513531.zip chromium_src-1631f7c651fbc7f4460a852126f545afc5513531.tar.gz chromium_src-1631f7c651fbc7f4460a852126f545afc5513531.tar.bz2 |
Implement web app definition parsing.
This required moving some code from webkit/glue to
chrome/common/web_apps.cc so that it could rely on
chrome/common/json_schema_validator.h.
BUG=49233
TEST=Convered by unit tests.
Review URL: http://codereview.chromium.org/4979003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66386 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, |