summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_theme_provider.cc
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-02 01:30:31 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-02 01:30:31 +0000
commit6d7342d33a13358f7acfb78cee3c7a3ebd67c226 (patch)
treec06b4d52c1ea327d06b7dcfe335c16aa2e5e8fb6 /chrome/browser/browser_theme_provider.cc
parent44d5d23bd0cd3d7fa0a688c444e3115088f9d2c3 (diff)
downloadchromium_src-6d7342d33a13358f7acfb78cee3c7a3ebd67c226.zip
chromium_src-6d7342d33a13358f7acfb78cee3c7a3ebd67c226.tar.gz
chromium_src-6d7342d33a13358f7acfb78cee3c7a3ebd67c226.tar.bz2
Revert 33526 - Fix the opacity of titlebars on the NTP page. We were accidentally
setting the opacity to 1/255. This bug was introduced in r32643. BUG=29107 Review URL: http://codereview.chromium.org/452040 TBR=tony@chromium.org Review URL: http://codereview.chromium.org/460004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33528 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_theme_provider.cc')
-rw-r--r--chrome/browser/browser_theme_provider.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc
index aceedf1..be81770 100644
--- a/chrome/browser/browser_theme_provider.cc
+++ b/chrome/browser/browser_theme_provider.cc
@@ -1112,9 +1112,9 @@ void BrowserThemeProvider::SetColorData(DictionaryValue* colors_value) {
colors_[WideToUTF8(*iter)] =
SkColorSetARGB(static_cast<int>(alpha * 255), r, g, b);
} else if (color_list->GetInteger(3, &alpha_int) &&
- (alpha_int == 0 || alpha_int == 1)) {
+ (alpha_int >= 0 && alpha_int <= 255)) {
colors_[WideToUTF8(*iter)] =
- SkColorSetARGB(alpha_int ? 255 : 0, r, g, b);
+ SkColorSetARGB(alpha_int, r, g, b);
}
} else {
colors_[WideToUTF8(*iter)] = SkColorSetRGB(r, g, b);