summaryrefslogtreecommitdiffstats
path: root/chrome/browser/dom_ui
diff options
context:
space:
mode:
authorcsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-22 01:15:43 +0000
committercsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-22 01:15:43 +0000
commit604c253e2bb770ad01757c728f9cdc3b4acc1ca6 (patch)
tree1ee943e01b44af23d01720a56da09c41be9cef0e /chrome/browser/dom_ui
parentb2afa268959501137bb8b9ba83477b870d97728b (diff)
downloadchromium_src-604c253e2bb770ad01757c728f9cdc3b4acc1ca6.zip
chromium_src-604c253e2bb770ad01757c728f9cdc3b4acc1ca6.tar.gz
chromium_src-604c253e2bb770ad01757c728f9cdc3b4acc1ca6.tar.bz2
dom-ui settings: Add icon for settings tab.
BUG=56153 TEST=Verify that the dom-ui settings tab displays the proper favicon. Review URL: http://codereview.chromium.org/3444012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
-rw-r--r--chrome/browser/dom_ui/options_ui.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/dom_ui/options_ui.cc b/chrome/browser/dom_ui/options_ui.cc
index a050a24..15a7ed8 100644
--- a/chrome/browser/dom_ui/options_ui.cc
+++ b/chrome/browser/dom_ui/options_ui.cc
@@ -197,10 +197,8 @@ OptionsUI::~OptionsUI() {
// static
RefCountedMemory* OptionsUI::GetFaviconResourceBytes() {
-// TODO(csilv): uncomment this once we have a FAVICON
-// return ResourceBundle::GetSharedInstance().
-// LoadDataResourceBytes(IDR_OPTIONS_FAVICON);
- return NULL;
+ return ResourceBundle::GetSharedInstance().
+ LoadDataResourceBytes(IDR_SETTINGS_FAVICON);
}
void OptionsUI::InitializeHandlers() {