From d978840b3799a139f284c413ffe79b03944afa5e Mon Sep 17 00:00:00 2001 From: "aa@chromium.org" Date: Wed, 17 Nov 2010 05:34:36 +0000 Subject: Revert "Implement web app definition parsing." This reverts commit 24e3962db61243eea4976bead441c6206cd4f21e. TBR=aa@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66394 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/web_applications/web_app.cc | 12 +++++++----- chrome/browser/web_applications/web_app.h | 6 +++--- chrome/browser/web_applications/web_app_unittest.cc | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) (limited to 'chrome/browser/web_applications') diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc index 79fb3f7..fc385a6 100644 --- a/chrome/browser/web_applications/web_app.cc +++ b/chrome/browser/web_applications/web_app.cc @@ -32,7 +32,7 @@ #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" -#include "chrome/common/web_apps.h" +#include "webkit/glue/dom_operations.h" #if defined(OS_LINUX) #include "base/environment.h" @@ -114,8 +114,9 @@ FilePath GetWebAppDataDirectory(const FilePath& root_dir, #if defined(TOOLKIT_VIEWS) // Predicator for sorting images from largest to smallest. -bool IconPrecedes(const WebApplicationInfo::IconInfo& left, - const WebApplicationInfo::IconInfo& right) { +bool IconPrecedes( + const webkit_glue::WebApplicationInfo::IconInfo& left, + const webkit_glue::WebApplicationInfo::IconInfo& right) { return left.width < right.width; } #endif @@ -722,7 +723,7 @@ FilePath GetDataDir(const FilePath& profile_path) { } #if defined(TOOLKIT_VIEWS) -void GetIconsInfo(const WebApplicationInfo& app_info, +void GetIconsInfo(const webkit_glue::WebApplicationInfo& app_info, IconInfoList* icons) { DCHECK(icons); @@ -742,7 +743,8 @@ void GetShortcutInfoForTab(TabContents* tab_contents, ShellIntegration::ShortcutInfo* info) { DCHECK(info); // Must provide a valid info. - const WebApplicationInfo& app_info = tab_contents->web_app_info(); + const webkit_glue::WebApplicationInfo& app_info = + tab_contents->web_app_info(); info->url = app_info.app_url.is_empty() ? tab_contents->GetURL() : app_info.app_url; diff --git a/chrome/browser/web_applications/web_app.h b/chrome/browser/web_applications/web_app.h index 4734b7e..c451e85 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 "chrome/common/web_apps.h" +#include "webkit/glue/dom_operations.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 IconInfoList; -void GetIconsInfo(const WebApplicationInfo& app_info, +typedef std::vector IconInfoList; +void GetIconsInfo(const webkit_glue::WebApplicationInfo& app_info, IconInfoList* icons); #endif diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc index a999f33..a8fc395 100644 --- a/chrome/browser/web_applications/web_app_unittest.cc +++ b/chrome/browser/web_applications/web_app_unittest.cc @@ -43,7 +43,7 @@ TEST_F(WebApplicationTest, GetShortcutInfoForTab) { const string16 title = ASCIIToUTF16("TEST_TITLE"); const string16 description = ASCIIToUTF16("TEST_DESCRIPTION"); const GURL url("http://www.foo.com/bar"); - WebApplicationInfo web_app_info; + webkit_glue::WebApplicationInfo web_app_info; web_app_info.title = title; web_app_info.description = description; web_app_info.app_url = url; -- cgit v1.1