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 | |
| 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
| -rw-r--r-- | chrome/app/theme/about_conflicts.png | bin | 0 -> 6200 bytes | |||
| -rw-r--r-- | chrome/app/theme/about_conflicts_favicon.png | bin | 0 -> 1649 bytes | |||
| -rw-r--r-- | chrome/app/theme/conflicts_section.png | bin | 8157 -> 0 bytes | |||
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 1 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/conflicts_ui.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/resources/about_conflicts.html | 4 |
6 files changed, 4 insertions, 3 deletions
diff --git a/chrome/app/theme/about_conflicts.png b/chrome/app/theme/about_conflicts.png Binary files differnew file mode 100644 index 0000000..a2410b9 --- /dev/null +++ b/chrome/app/theme/about_conflicts.png diff --git a/chrome/app/theme/about_conflicts_favicon.png b/chrome/app/theme/about_conflicts_favicon.png Binary files differnew file mode 100644 index 0000000..faab84b --- /dev/null +++ b/chrome/app/theme/about_conflicts_favicon.png diff --git a/chrome/app/theme/conflicts_section.png b/chrome/app/theme/conflicts_section.png Binary files differdeleted file mode 100644 index 228674e..0000000 --- a/chrome/app/theme/conflicts_section.png +++ /dev/null diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index ab0a951..26df377 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -81,6 +81,7 @@ <if expr="os.find('win') != -1"> <include name="IDR_CONFLICT_BADGE" file="conflict_badge.png" type="BINDATA" /> <include name="IDR_CONFLICT_MENU" file="conflict_menu.png" type="BINDATA" /> + <include name="IDR_CONFLICT_FAVICON" file="about_conflicts_favicon.png" type="BINDATA" /> </if> <include name="IDR_CONSTRAINED_BOTTOM_CENTER_V" file="constrained_bottom_center_v.png" type="BINDATA" /> <include name="IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V" file="constrained_bottom_left_corner_v.png" type="BINDATA" /> 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 diff --git a/chrome/browser/resources/about_conflicts.html b/chrome/browser/resources/about_conflicts.html index a2e36d8..c4365ff 100644 --- a/chrome/browser/resources/about_conflicts.html +++ b/chrome/browser/resources/about_conflicts.html @@ -30,7 +30,7 @@ html[dir=rtl] #header { } #header h1 { - background: url('../../app/theme/conflicts_section.png') 0px 20px no-repeat; + background: url('../../app/theme/about_conflicts.png') 0px 20px no-repeat; display: inline; margin: 0; padding-bottom: 43px; @@ -39,7 +39,7 @@ html[dir=rtl] #header { } html[dir=rtl] #header h1 { - background: url('../../app/theme/conflicts_section.png') right no-repeat; + background: url('../../app/theme/about_conflicts.png') right no-repeat; padding-right: 95px; padding-left: 0; } |
