From d3ef5942dc19d90fe64e721c0733573d4a89caa5 Mon Sep 17 00:00:00 2001
From: "finnur@chromium.org"
 <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 23 Oct 2009 19:20:28 +0000
Subject: Adding a favicon for the Extensions page.

BUG=25509
TEST=Open the extensions page and its tab should have an icon.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29922 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/theme/extensions_favicon.png    | Bin 0 -> 863 bytes
 chrome/app/theme/theme_resources.grd       |   1 +
 chrome/browser/dom_ui/dom_ui_factory.cc    |   3 +++
 chrome/browser/extensions/extensions_ui.cc |   7 +++++++
 chrome/browser/extensions/extensions_ui.h  |   2 ++
 5 files changed, 13 insertions(+)
 create mode 100644 chrome/app/theme/extensions_favicon.png

diff --git a/chrome/app/theme/extensions_favicon.png b/chrome/app/theme/extensions_favicon.png
new file mode 100644
index 0000000..f3da311
Binary files /dev/null and b/chrome/app/theme/extensions_favicon.png differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 9296a60..40a534f 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -259,6 +259,7 @@
       <include name="IDR_HOME_P" file="home_p.png" type="BINDATA" />
       <include name="IDR_HISTORY_FAVICON" file="history_favicon.png" type="BINDATA" />
       <include name="IDR_DOWNLOADS_FAVICON" file="downloads_favicon.png" type="BINDATA" />
+      <include name="IDR_EXTENSIONS_FAVICON" file="extensions_favicon.png" type="BINDATA" />
       <include name="IDR_MENU_PAGE_RTL" file="menu_page_rtl.png" type="BINDATA" />
       <include name="IDR_MENU_CHROME_RTL" file="menu_chrome_rtl.png" type="BINDATA" />
       <include name="IDR_DOWNLOAD_ANIMATION_BEGIN" file="download_animation_begin.png" type="BINDATA" />
diff --git a/chrome/browser/dom_ui/dom_ui_factory.cc b/chrome/browser/dom_ui/dom_ui_factory.cc
index 9912ee3..150afe7 100644
--- a/chrome/browser/dom_ui/dom_ui_factory.cc
+++ b/chrome/browser/dom_ui/dom_ui_factory.cc
@@ -137,5 +137,8 @@ RefCountedMemory* DOMUIFactory::GetFaviconResourceBytes(
   if (page_url.host() == chrome::kChromeUIDownloadsHost)
     return DownloadsUI::GetFaviconResourceBytes();
 
+  if (page_url.host() == chrome::kChromeUIExtensionsHost)
+    return ExtensionsUI::GetFaviconResourceBytes();
+
   return NULL;
 }
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index 3936b69..7013829 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -34,6 +34,7 @@
 
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -509,3 +510,9 @@ ExtensionsUI::ExtensionsUI(TabContents* contents) : DOMUI(contents) {
       NewRunnableMethod(&chrome_url_data_manager,
           &ChromeURLDataManager::AddDataSource, html_source));
 }
+
+// static
+RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes() {
+  return ResourceBundle::GetSharedInstance().
+      LoadImageResourceBytes(IDR_EXTENSIONS_FAVICON);
+}
diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h
index 90c0e92..f315504 100644
--- a/chrome/browser/extensions/extensions_ui.h
+++ b/chrome/browser/extensions/extensions_ui.h
@@ -151,6 +151,8 @@ class ExtensionsUI : public DOMUI {
  public:
   explicit ExtensionsUI(TabContents* contents);
 
+  static RefCountedMemory* GetFaviconResourceBytes();
+
  private:
   DISALLOW_COPY_AND_ASSIGN(ExtensionsUI);
 };
-- 
cgit v1.1