diff options
| author | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-22 01:15:43 +0000 |
|---|---|---|
| committer | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-22 01:15:43 +0000 |
| commit | 604c253e2bb770ad01757c728f9cdc3b4acc1ca6 (patch) | |
| tree | 1ee943e01b44af23d01720a56da09c41be9cef0e /chrome | |
| parent | b2afa268959501137bb8b9ba83477b870d97728b (diff) | |
| download | chromium_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')
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 1 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/options_ui.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/resources/options.html | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index b97feaf..aca0ad4 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -340,6 +340,7 @@ <include name="IDR_SEARCH_ENGINE_LOGO_YANDEX" file="notused.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_ZOZNAM" file="notused.png" type="BINDATA" /> </if> + <include name="IDR_SETTINGS_FAVICON" file="settings_favicon.png" type="BINDATA" /> <include name="IDR_SIDETABS_NEW_TAB" file="sidetabs_new_tab.png" type="BINDATA" /> <include name="IDR_STAR" file="star.png" type="BINDATA" /> <include name="IDR_STAR_LIT" file="star_lit.png" type="BINDATA" /> 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() { diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html index 905950c..350ad9c 100644 --- a/chrome/browser/resources/options.html +++ b/chrome/browser/resources/options.html @@ -4,8 +4,7 @@ <meta charset="utf-8"> <title i18n-content="title"></title> -<!-- TODO(zelidrag) need a better icon here --> -<link rel="icon" href="../../app/theme/history_favicon.png"> +<link rel="icon" href="../../app/theme/settings_favicon.png"> <link rel="stylesheet" href="chrome://resources/css/list.css"> <link rel="stylesheet" href="chrome://resources/css/tree.css"> <link rel="stylesheet" href="dom_ui.css"> |