Chromium Code Reviews
Help | Chromium Project | Sign in
(649)

Issue 5124004: Use the new icons from Cole for about:conflicts. (Closed)

Can't Edit
Can't Publish+Mail
Start Review
Created:
3 years, 5 months ago by Finnur
Modified:
2 years, 10 months ago
Reviewers:
Nico
CC:
chromium-reviews_chromium.org, arv, ben+cc_chromium.org
Visibility:
Public.

Description

Use the new icons from Cole for about:conflicts.

BUG=51105
TEST=None


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=66766

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+4 lines, -3 lines) Lint Patch
A chrome/app/theme/about_conflicts.png View Binary file 0 comments 0 errors Download
A chrome/app/theme/about_conflicts_favicon.png View Binary file 0 comments 0 errors Download
D chrome/app/theme/conflicts_section.png View Binary file 0 comments 0 errors Download
M chrome/app/theme/theme_resources.grd View 1 chunk +1 line, -0 lines 0 comments 0 errors Download
M chrome/browser/dom_ui/conflicts_ui.cc View 1 chunk +1 line, -1 line 0 comments 0 errors Download
M chrome/browser/resources/about_conflicts.html View 2 chunks +2 lines, -2 lines 0 comments 0 errors Download
Commit:

Messages

Total messages: 3
Finnur
3 years, 5 months ago #1
Nico
Lgtm All the other icons aren't named"about_Foo" iirc, but your name makes more sense :-p ...
3 years, 5 months ago #2
Finnur
3 years, 5 months ago #3
Yeah, these icons are the only ones that are used on the actual about:conflicts
page. The other icons appear elsewhere in the product.

Thanks for a quick review.


On 2010/11/19 14:59:51, Nico wrote:
> Lgtm
> 
> All the other icons aren't named"about_Foo" iirc, but your name makes more
> sense :-p
> On Nov 19, 2010 3:36 PM, <mailto:finnur@chromium.org> wrote:
> > Reviewers: Nico,
> >
> > Description:
> > Use the new icons from Cole for about:conflicts.
> >
> > BUG=51105
> > TEST=None
> >
> >
> > Please review this at http://codereview.chromium.org/5124004/
> >
> > SVN Base: svn://svn.chromium.org/chrome/trunk/src/
> >
> > Affected files:
> > A chrome/app/theme/about_conflicts.png
> > A chrome/app/theme/about_conflicts_favicon.png
> > D chrome/app/theme/conflicts_section.png
> > M chrome/app/theme/theme_resources.grd
> > M chrome/browser/dom_ui/conflicts_ui.cc
> > M chrome/browser/resources/about_conflicts.html
> >
> >
> > Index: chrome/app/theme/about_conflicts.png
> > ===================================================================
> > Cannot display: file marked as a binary type.
> > svn:mime-type = image/png
> >
> > Property changes on: chrome\app\theme\about_conflicts.png
> > ___________________________________________________________________
> > Added: svn:mime-type
> > + image/png
> >
> > Index: chrome/app/theme/about_conflicts_favicon.png
> > ===================================================================
> > Cannot display: file marked as a binary type.
> > svn:mime-type = image/png
> >
> > Property changes on: chrome\app\theme\about_conflicts_favicon.png
> > ___________________________________________________________________
> > Added: svn:mime-type
> > + image/png
> >
> > Index: chrome/app/theme/conflicts_section.png
> > ===================================================================
> > Cannot display: file marked as a binary type.
> > svn:mime-type = image/png
> > Index: chrome/app/theme/theme_resources.grd
> > ===================================================================
> > --- chrome/app/theme/theme_resources.grd (revision 66751)
> > +++ chrome/app/theme/theme_resources.grd (working copy)
> > @@ -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" />
> > Index: chrome/browser/dom_ui/conflicts_ui.cc
> > ===================================================================
> > --- chrome/browser/dom_ui/conflicts_ui.cc (revision 66751)
> > +++ chrome/browser/dom_ui/conflicts_ui.cc (working copy)
> > @@ -207,7 +207,7 @@
> > // static
> > RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() {
> > return ResourceBundle::GetSharedInstance().
> > - LoadDataResourceBytes(IDR_CONFLICT_MENU);
> > + LoadDataResourceBytes(IDR_CONFLICT_FAVICON);
> > }
> >
> > #endif
> > Index: chrome/browser/resources/about_conflicts.html
> > ===================================================================
> > --- chrome/browser/resources/about_conflicts.html (revision 66756)
> > +++ chrome/browser/resources/about_conflicts.html (working copy)
> > @@ -30,7 +30,7 @@
> > }
> >
> > #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 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;
> > }
> >
> >
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld 1280:2d3e6564b7b6