chrome/common/extensions/extension_action.cc - Issue 306059: Merge 29556 - Revert "Revert 29457, because this is making ExtensionBrowserTe...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/extensions/extension_action.cc

Issue 306059: Merge 29556 - Revert "Revert 29457, because this is making ExtensionBrowserTe... (Closed) Base URL: svn://chrome-svn/chrome/branches/223/src/

Patch Set: Created 11 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/common/extensions/extension_action.h ('k') | chrome/test/data/extensions/samples/test_browser_action/background.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/extension_action.cc

===================================================================

--- chrome/common/extensions/extension_action.cc (revision 29822)

+++ chrome/common/extensions/extension_action.cc (working copy)

@@ -20,7 +20,7 @@

}

void ExtensionActionState::PaintBadge(gfx::Canvas* canvas,

- const gfx::Rect& bounds) {

+ const gfx::Rect& bounds) const {

const std::string& text = badge_text();

if (text.empty())

return;

@@ -49,7 +49,7 @@

SkTypeface* typeface = SkTypeface::CreateFromName("Arial", SkTypeface::kBold);

SkPaint text_paint;

text_paint.setAntiAlias(true);

- text_paint.setColor(SK_ColorWHITE);

+ text_paint.setColor(badge_text_color());

text_paint.setFakeBoldText(true);

text_paint.setTextAlign(SkPaint::kLeft_Align);

text_paint.setTextSize(SkIntToScalar(kTextSize));

Property changes on: chrome\common\extensions\extension_action.cc

___________________________________________________________________

Modified: svn:mergeinfo

Merged /trunk/src/chrome/common/extensions/extension_action.cc:r29556