diff options
| author | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-10 00:24:03 +0000 |
|---|---|---|
| committer | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-10 00:24:03 +0000 |
| commit | 509d0147a1181d39ab3f0eca7584f6e1b1290aba (patch) | |
| tree | 43fe973009e335f5bdce5c08db2a91e675b99798 | |
| parent | 584b8e3f26b6d751c807907ce3c480a698a961a4 (diff) | |
| download | chromium_src-509d0147a1181d39ab3f0eca7584f6e1b1290aba.zip chromium_src-509d0147a1181d39ab3f0eca7584f6e1b1290aba.tar.gz chromium_src-509d0147a1181d39ab3f0eca7584f6e1b1290aba.tar.bz2 | |
Add favicons to the bookmark manager.
This depends on http://codereview.chromium.org/1610011/show
BUG=37802
TEST=Open the bookmark manager. It should now show favicons.
Review URL: http://codereview.chromium.org/1574021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44168 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/bookmark_manager/images/default_favicon.png | bin | 278 -> 0 bytes | |||
| -rw-r--r-- | chrome/browser/resources/bookmark_manager/js/bmm/bookmarklist.js | 7 | ||||
| -rw-r--r-- | chrome/browser/resources/bookmark_manager/manifest.json | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/resources/bookmark_manager/images/default_favicon.png b/chrome/browser/resources/bookmark_manager/images/default_favicon.png Binary files differdeleted file mode 100644 index a0aec4a..0000000 --- a/chrome/browser/resources/bookmark_manager/images/default_favicon.png +++ /dev/null diff --git a/chrome/browser/resources/bookmark_manager/js/bmm/bookmarklist.js b/chrome/browser/resources/bookmark_manager/js/bmm/bookmarklist.js index edec7e9..b091f89 100644 --- a/chrome/browser/resources/bookmark_manager/js/bmm/bookmarklist.js +++ b/chrome/browser/resources/bookmark_manager/js/bmm/bookmarklist.js @@ -406,11 +406,8 @@ cr.define('bmm', function() { var labelEl = el.firstChild; labelEl.textContent = bookmarkNode.title; if (!bmm.isFolder(bookmarkNode)) { - // TODO(arv): Switch to favicon when the bug is fixed: - // http://code.google.com/p/chromium/issues/detail?id=37802 - labelEl.style.backgroundImage = url('images/default_favicon.png'); - //labelEl.style.backgroundImage = url('chrome://favicon/' + - // bookmarkNode.url); + labelEl.style.backgroundImage = url('chrome://favicon/' + + bookmarkNode.url); var urlEl = el.childNodes[1].firstChild; urlEl.textContent = urlEl.href = bookmarkNode.url; diff --git a/chrome/browser/resources/bookmark_manager/manifest.json b/chrome/browser/resources/bookmark_manager/manifest.json index 070bf6f..de24916 100644 --- a/chrome/browser/resources/bookmark_manager/manifest.json +++ b/chrome/browser/resources/bookmark_manager/manifest.json @@ -9,7 +9,8 @@ "permissions": [ "bookmarks", "experimental", - "tabs" + "tabs", + "chrome://favicon/" ], "chrome_url_overrides": { "bookmarks": "main.html" |
