diff options
| -rw-r--r-- | chrome/app/theme/extensions_favicon.png | bin | 0 -> 863 bytes | |||
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 1 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/dom_ui_factory.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/extensions/extensions_ui.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/extensions/extensions_ui.h | 2 |
5 files changed, 13 insertions, 0 deletions
diff --git a/chrome/app/theme/extensions_favicon.png b/chrome/app/theme/extensions_favicon.png Binary files differnew file mode 100644 index 0000000..f3da311 --- /dev/null +++ b/chrome/app/theme/extensions_favicon.png 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); }; |
