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/web_applications/web_app.h | |
| 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/web_applications/web_app.h')
| -rw-r--r-- | chrome/browser/web_applications/web_app.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/web_applications/web_app.h b/chrome/browser/web_applications/web_app.h index c451e85..4734b7e 100644 --- a/chrome/browser/web_applications/web_app.h +++ b/chrome/browser/web_applications/web_app.h @@ -11,7 +11,7 @@ #include "base/callback.h" #include "build/build_config.h" #include "chrome/browser/shell_integration.h" -#include "webkit/glue/dom_operations.h" +#include "chrome/common/web_apps.h" class FilePath; class Profile; @@ -47,8 +47,8 @@ FilePath GetDataDir(const FilePath& profile_path); #if defined(TOOLKIT_VIEWS) // Extracts icons info from web app data. Take only square shaped icons and // sort them from smallest to largest. -typedef std::vector<webkit_glue::WebApplicationInfo::IconInfo> IconInfoList; -void GetIconsInfo(const webkit_glue::WebApplicationInfo& app_info, +typedef std::vector<WebApplicationInfo::IconInfo> IconInfoList; +void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons); #endif |