summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-26 01:58:17 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-26 01:58:17 +0000
commit1472dfd10f36e62dd1fc0b0f91c8c3dec450e3a5 (patch)
tree971710ca1d22b52dcfc0aac57336ab36ed2fc7e4 /webkit
parent2fbc33967abe8fd301a1c0ce35a625ed98bf41f9 (diff)
downloadchromium_src-1472dfd10f36e62dd1fc0b0f91c8c3dec450e3a5.zip
chromium_src-1472dfd10f36e62dd1fc0b0f91c8c3dec450e3a5.tar.gz
chromium_src-1472dfd10f36e62dd1fc0b0f91c8c3dec450e3a5.tar.bz2
Remove references to feed preview, which was removed years ago.
TEST=tests still pass Review URL: http://codereview.chromium.org/2150005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/resources/feed.html18
-rw-r--r--webkit/glue/webkit_resources.grd1
-rw-r--r--webkit/support/platform_support_mac.mm6
-rw-r--r--webkit/tools/test_shell/test_shell_mac.mm6
-rw-r--r--webkit/tools/test_shell/test_shell_win.cc6
5 files changed, 0 insertions, 37 deletions
diff --git a/webkit/glue/resources/feed.html b/webkit/glue/resources/feed.html
deleted file mode 100644
index c6a5747d..0000000
--- a/webkit/glue/resources/feed.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
- <head>
- <title>Feed Content</title>
- <style type='text/css'>
- body {
- margin: 5ex 7ex;
- font-family: sans-serif;
- }
- </style>
- </head>
- <body>
- <p>This is a <a href="http://en.wikipedia.org/wiki/Web_feed">feed</a> that
- can be displayed in a feed reader.</p>
-
- <p><a href="http://www.google.com/ig/add?feedurl={{URL}}">Subscribe via
- Google</a>.</p>
- </body>
-</html>
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
index 4b3ff7a..352d18c 100644
--- a/webkit/glue/webkit_resources.grd
+++ b/webkit/glue/webkit_resources.grd
@@ -11,7 +11,6 @@
<includes>
<include name="IDR_BROKENIMAGE" file="resources\broken-image.gif" type="BINDATA" />
<include name="IDR_TICKMARK_DASH" file="resources\dash.png" type="BINDATA" />
- <include name="IDR_FEED_PREVIEW" file="resources\feed.html" type="BINDATA" />
<include name="IDR_PAN_SCROLL_ICON" file="resources\pan_icon.png" type="BINDATA" />
<include name="IDR_SEARCH_CANCEL" file="resources\search_cancel.png" type="BINDATA" />
<include name="IDR_SEARCH_CANCEL_PRESSED" file="resources\search_cancel_pressed.png" type="BINDATA" />
diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm
index 5143fe2..e84dcd2 100644
--- a/webkit/support/platform_support_mac.mm
+++ b/webkit/support/platform_support_mac.mm
@@ -190,12 +190,6 @@ base::StringPiece GetDataResource(int resource_id) {
}
return broken_image_data;
}
- case IDR_FEED_PREVIEW:
- // It is necessary to return a feed preview template that contains
- // a {{URL}} substring where the feed URL should go; see the code
- // that computes feed previews in feed_preview.cc:MakeFeedPreview.
- // This fixes issue #932714.
- return "Feed preview for {{URL}}";
case IDR_TEXTAREA_RESIZER: {
// Use webkit's text area resizer image.
static std::string resize_corner_data;
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 618f91d..2e4041e 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -679,12 +679,6 @@ base::StringPiece GetDataResource(int resource_id) {
}
return broken_image_data;
}
- case IDR_FEED_PREVIEW:
- // It is necessary to return a feed preview template that contains
- // a {{URL}} substring where the feed URL should go; see the code
- // that computes feed previews in feed_preview.cc:MakeFeedPreview.
- // This fixes issue #932714.
- return "Feed preview for {{URL}}";
case IDR_TEXTAREA_RESIZER: {
// Use webkit's text area resizer image.
static std::string resize_corner_data;
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 5653d6e..e76d373 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -757,12 +757,6 @@ base::StringPiece GetDataResource(int resource_id) {
}
return broken_image_data;
}
- case IDR_FEED_PREVIEW:
- // It is necessary to return a feed preview template that contains
- // a {{URL}} substring where the feed URL should go; see the code
- // that computes feed previews in feed_preview.cc:MakeFeedPreview.
- // This fixes issue #932714.
- return "Feed preview for {{URL}}";
case IDR_TEXTAREA_RESIZER: {
// Use webkit's text area resizer image.
static std::string resize_corner_data;