diff options
| author | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-10 23:51:56 +0000 |
|---|---|---|
| committer | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-10 23:51:56 +0000 |
| commit | c1ed7bf7d2e70bab9fe7f4c93139ba3a47985a18 (patch) | |
| tree | 0e65c0a41e4517fd1b6abae81db3a4143d646592 | |
| parent | 15b3b56a70dfa4f8c35f2723ee6ed1e9c9b25b1c (diff) | |
| download | chromium_src-c1ed7bf7d2e70bab9fe7f4c93139ba3a47985a18.zip chromium_src-c1ed7bf7d2e70bab9fe7f4c93139ba3a47985a18.tar.gz chromium_src-c1ed7bf7d2e70bab9fe7f4c93139ba3a47985a18.tar.bz2 | |
This adds link[rel=icon] elements to the DOM UI html files for downloads and
history.
It also adds code to inline the resources for <link rel="icon"> elements
BUG=9805
Review URL: http://codereview.chromium.org/66041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13550 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/downloads.html | 1 | ||||
| -rw-r--r-- | chrome/browser/resources/history.html | 1 | ||||
| -rwxr-xr-x | tools/grit/grit/format/html_inline.py | 9 |
3 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/resources/downloads.html b/chrome/browser/resources/downloads.html index 6f1a545..62ceed7 100644 --- a/chrome/browser/resources/downloads.html +++ b/chrome/browser/resources/downloads.html @@ -3,6 +3,7 @@ <head> <meta charset="utf-8"> <title jscontent="title"></title> +<link rel="icon" href="../../app/theme/downloads_favicon.png"> <style type="text/css"> body { background-color:white; diff --git a/chrome/browser/resources/history.html b/chrome/browser/resources/history.html index 4f7347b..8c5b099 100644 --- a/chrome/browser/resources/history.html +++ b/chrome/browser/resources/history.html @@ -3,6 +3,7 @@ <head> <meta charset="utf-8"> <title jscontent="title"></title> +<link rel="icon" href="../../app/theme/history_favicon.png"> <script type="text/javascript"> /////////////////////////////////////////////////////////////////////////////// // Globals: diff --git a/tools/grit/grit/format/html_inline.py b/tools/grit/grit/format/html_inline.py index cf8effe..9871fbd 100755 --- a/tools/grit/grit/format/html_inline.py +++ b/tools/grit/grit/format/html_inline.py @@ -98,8 +98,12 @@ def InlineFile(input_filename, output_filename): # TODO(glen): Make this regex not match url('') that is not inside a style flat_text = re.sub('background:[ ]*url\(\'(?P<filename>[^"\']*)\'', - SrcReplace, - flat_text) + SrcReplace, + flat_text) + + flat_text = re.sub('<link rel="icon".+?href="(?P<filename>[^"\']*)"', + SrcReplace, + flat_text) out_file = open(output_filename, 'wb') out_file.writelines(flat_text) @@ -114,4 +118,3 @@ def main(): if __name__ == '__main__': main() - |