diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 15:06:28 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 15:06:28 +0000 |
| commit | d7731ea9bb786ffb58b4c212e391483904d07b7d (patch) | |
| tree | 275a8089d0ae5a21782706f29c5bba7fd9192bb6 /chrome/browser/dom_ui/conflicts_ui.cc | |
| parent | f48fdae2c17fbaca9341f6fcdcd0d4b663310b12 (diff) | |
| download | chromium_src-d7731ea9bb786ffb58b4c212e391483904d07b7d.zip chromium_src-d7731ea9bb786ffb58b4c212e391483904d07b7d.tar.gz chromium_src-d7731ea9bb786ffb58b4c212e391483904d07b7d.tar.bz2 | |
Use the new icons from Cole for about:conflicts.
BUG=51105
TEST=None
Review URL: http://codereview.chromium.org/5124004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui/conflicts_ui.cc')
| -rw-r--r-- | chrome/browser/dom_ui/conflicts_ui.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/dom_ui/conflicts_ui.cc b/chrome/browser/dom_ui/conflicts_ui.cc index 45a6f18..555430e 100644 --- a/chrome/browser/dom_ui/conflicts_ui.cc +++ b/chrome/browser/dom_ui/conflicts_ui.cc @@ -207,7 +207,7 @@ ConflictsUI::ConflictsUI(TabContents* contents) : DOMUI(contents) { // static RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { return ResourceBundle::GetSharedInstance(). - LoadDataResourceBytes(IDR_CONFLICT_MENU); + LoadDataResourceBytes(IDR_CONFLICT_FAVICON); } #endif |