Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Unified Diff: ash/frame/default_header_painter.cc

Issue 934673002: Remove transparency from inactive ash app windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « ash/frame/default_header_painter.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/frame/default_header_painter.cc
diff --git a/ash/frame/default_header_painter.cc b/ash/frame/default_header_painter.cc
index 530a6d703fc0ce08298b2562abf57b2af155dc80..236919f3c709e97c7cd1291c6e4de6e3da6710a7 100644
--- a/ash/frame/default_header_painter.cc
+++ b/ash/frame/default_header_painter.cc
@@ -37,8 +37,6 @@ const SkColor kHeaderContentSeparatorInactiveColor =
SkColorSetRGB(180, 180, 182);
// The default color of the frame.
const SkColor kDefaultFrameColor = SkColorSetRGB(242, 242, 242);
-// The alpha of the inactive frame.
-const SkAlpha kInactiveFrameAlpha = 204;
// Duration of crossfade animation for activating and deactivating frame.
const int kActivationCrossfadeDurationMs = 200;
@@ -165,8 +163,8 @@ void DefaultHeaderPainter::PaintHeader(gfx::Canvas* canvas, Mode mode) {
SkPaint paint;
int active_alpha = activation_animation_->CurrentValueBetween(0, 255);
- paint.setColor(color_utils::AlphaBlend(
- active_frame_color_, GetInactiveFrameColor(), active_alpha));
+ paint.setColor(color_utils::AlphaBlend(active_frame_color_,
+ inactive_frame_color_, active_alpha));
TileRoundRect(canvas, paint, GetLocalBounds(), corner_radius);
@@ -345,15 +343,4 @@ bool DefaultHeaderPainter::UsesCustomFrameColors() const {
inactive_frame_color_ != kDefaultFrameColor;
}
-SkColor DefaultHeaderPainter::GetInactiveFrameColor() const {
- SkColor color = inactive_frame_color_;
- if (!frame_->IsMaximized() && !frame_->IsFullscreen()) {
- color = SkColorSetARGB(kInactiveFrameAlpha,
- SkColorGetR(color),
- SkColorGetG(color),
- SkColorGetB(color));
- }
- return color;
-}
-
} // namespace ash
« no previous file with comments | « ash/frame/default_header_painter.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698