Add an icon for local storage and web databses in the cookie manager.

BUG=33196
TEST=Go to http://webkit.org/misc/DatabaseExample.html. Open cookie manager and find entry for webkit.org. See database icon.
TEST=Go to http://demos.hacks.mozilla.org/openweb/todo/ and repeat above steps. Same icon.

Review URL: http://codereview.chromium.org/661064

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39990 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 2 deletions

diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc
index 717ef27..99cc0ad 100644
--- a/chrome/browser/cookies_tree_model.cc
+++ b/chrome/browser/cookies_tree_model.cc
@@ -357,6 +357,8 @@ void CookiesTreeModel::GetIcons(std::vector<SkBitmap>* icons) {
       IDR_DEFAULT_FAVICON));
   icons->push_back(*ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_COOKIE_ICON));
+  icons->push_back(*ResourceBundle::GetSharedInstance().GetBitmapNamed(
+      IDR_COOKIE_STORAGE_ICON));
 }
 
 // Returns the index of the icon to use for |node|. Return -1 to use the
@@ -372,9 +374,13 @@ int CookiesTreeModel::GetIconIndex(TreeModelNode* node) {
       return COOKIE;
       break;
     case CookieTreeNode::DetailedInfo::TYPE_DATABASE:
-      // TODO(jochen): add an icon for databases.
+      return DATABASE;
+      break;
     case CookieTreeNode::DetailedInfo::TYPE_LOCAL_STORAGE:
-      // TODO(bulach): add an icon for local storage.
+      // The differences between local storage and HTML5 databases are semantic
+      // enough that the user will not likely care if they share an icon.
+      return DATABASE;
+      break;
     default:
       return -1;
   }