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

Side by Side Diff: ash/common/frame/default_header_painter.cc

Issue 2550593002: Update WM shadows for MD. (Closed)
Patch Set: fix corners Created 4 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/common/frame/default_header_painter.h" 5 #include "ash/common/frame/default_header_painter.h"
6 6
7 #include "ash/common/ash_layout_constants.h" 7 #include "ash/common/ash_layout_constants.h"
8 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h " 8 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h "
9 #include "ash/common/frame/header_painter_util.h" 9 #include "ash/common/frame/header_painter_util.h"
10 #include "base/debug/leak_annotations.h" 10 #include "base/debug/leak_annotations.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 } 136 }
137 137
138 int corner_radius = (frame_->IsMaximized() || frame_->IsFullscreen()) 138 int corner_radius = (frame_->IsMaximized() || frame_->IsFullscreen())
139 ? 0 139 ? 0
140 : HeaderPainterUtil::GetTopCornerRadiusWhenRestored(); 140 : HeaderPainterUtil::GetTopCornerRadiusWhenRestored();
141 141
142 SkPaint paint; 142 SkPaint paint;
143 int active_alpha = activation_animation_->CurrentValueBetween(0, 255); 143 int active_alpha = activation_animation_->CurrentValueBetween(0, 255);
144 paint.setColor(color_utils::AlphaBlend(active_frame_color_, 144 paint.setColor(color_utils::AlphaBlend(active_frame_color_,
145 inactive_frame_color_, active_alpha)); 145 inactive_frame_color_, active_alpha));
146 146 paint.setAntiAlias(true);
James Cook 2016/12/05 23:38:35 Why does this now require AA?
Evan Stade 2016/12/06 00:53:21 It should have always had AA, but it wasn't partic
147 TileRoundRect(canvas, paint, GetLocalBounds(), corner_radius); 147 TileRoundRect(canvas, paint, GetLocalBounds(), corner_radius);
148 148
149 if (!frame_->IsMaximized() && !frame_->IsFullscreen() && 149 if (!frame_->IsMaximized() && !frame_->IsFullscreen() &&
150 mode_ == MODE_INACTIVE && !UsesCustomFrameColors()) { 150 mode_ == MODE_INACTIVE && !UsesCustomFrameColors()) {
151 PaintHighlightForInactiveRestoredWindow(canvas); 151 PaintHighlightForInactiveRestoredWindow(canvas);
152 } 152 }
153 if (frame_->widget_delegate()->ShouldShowWindowTitle()) 153 if (frame_->widget_delegate()->ShouldShowWindowTitle())
154 PaintTitleBar(canvas); 154 PaintTitleBar(canvas);
155 if (!UsesCustomFrameColors()) 155 if (!UsesCustomFrameColors())
156 PaintHeaderContentSeparator(canvas); 156 PaintHeaderContentSeparator(canvas);
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 return HeaderPainterUtil::GetTitleBounds( 316 return HeaderPainterUtil::GetTitleBounds(
317 left_header_view_, caption_button_container_, GetTitleFontList()); 317 left_header_view_, caption_button_container_, GetTitleFontList());
318 } 318 }
319 319
320 bool DefaultHeaderPainter::UsesCustomFrameColors() const { 320 bool DefaultHeaderPainter::UsesCustomFrameColors() const {
321 return active_frame_color_ != kDefaultFrameColor || 321 return active_frame_color_ != kDefaultFrameColor ||
322 inactive_frame_color_ != kDefaultFrameColor; 322 inactive_frame_color_ != kDefaultFrameColor;
323 } 323 }
324 324
325 } // namespace ash 325 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_header_painter_ash.cc » ('j') | ui/gfx/image/image_skia_operations.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698