summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 23:52:47 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 23:52:47 +0000
commit78e5c2d126b66786cbd46da8c81895e862ef4269 (patch)
tree3ff44fe1028978d7ddd1179635bb439d1e776ce6 /webkit/glue
parent4d2f5afc236d6243af7a651b2fff34d21a2586a6 (diff)
downloadchromium_src-78e5c2d126b66786cbd46da8c81895e862ef4269.zip
chromium_src-78e5c2d126b66786cbd46da8c81895e862ef4269.tar.gz
chromium_src-78e5c2d126b66786cbd46da8c81895e862ef4269.tar.bz2
Revert 64845 - Add convert_web_app.*, a utility to convert web apps declared
in pure HTML into the extension-based web apps used internally by Chrome. BUG=49233 TEST=unit_tests --gtest_filter=ExtensionFromWebApp.* Review URL: http://codereview.chromium.org/4139008 TBR=aa@chromium.org Review URL: http://codereview.chromium.org/4326002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/dom_operations.h26
1 files changed, 8 insertions, 18 deletions
diff --git a/webkit/glue/dom_operations.h b/webkit/glue/dom_operations.h
index 1c668cf..951eb0f 100644
--- a/webkit/glue/dom_operations.h
+++ b/webkit/glue/dom_operations.h
@@ -10,7 +10,6 @@
#include "gfx/size.h"
#include "googleurl/src/gurl.h"
-#include "third_party/skia/include/core/SkBitmap.h"
namespace WebKit {
class WebDocument;
@@ -65,32 +64,23 @@ struct WebApplicationInfo {
GURL url;
int width;
int height;
- SkBitmap data;
};
- // URL to a manifest that defines the application. If specified, all other
- // attributes are derived from this manifest, and the manifest is the unique
- // ID of the application.
- GURL manifest_url;
-
- // Title of the application.
+ // Title of the application. This is set from the meta tag whose name is
+ // 'application-name'.
string16 title;
- // Description of the application.
+ // Description of the application. This is set from the meta tag whose name
+ // is 'description'.
string16 description;
- // The launch URL for the app.
+ // URL for the app. This is set from the meta tag whose name is
+ // 'application-url'.
GURL app_url;
- // Set of available icons.
+ // Set of available icons. This is set for all link tags whose rel=icon. Only
+ // icons that have a non-zero (width and/or height) are added.
std::vector<IconInfo> icons;
-
- // The permissions the app requests. Only supported with manifest-based apps.
- std::vector<std::string> permissions;
-
- // Set of URLs that comprise the app. Only supported with manifest-based apps.
- // All these must be of the same origin as manifest_url.
- std::vector<GURL> urls;
};
// Parses the icon's size attribute as defined in the HTML 5 spec. Returns true