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

Unified Diff: ash/common/frame/custom_frame_view_ash.cc

Issue 2336673002: Reland of [ash-md] Fades overview header in and out (Closed)
Patch Set: Fixes use-after-free for the views that get destroyed synchronously in tests Created 4 years, 3 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/aura/wm_window_aura.cc ('k') | ash/common/frame/default_header_painter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/frame/custom_frame_view_ash.cc
diff --git a/ash/common/frame/custom_frame_view_ash.cc b/ash/common/frame/custom_frame_view_ash.cc
index 530dad124e524f7bad9d79d20f381485a784dcdf..ac441c4327cdc2c4d935cca9f3512a85e1b3b5a6 100644
--- a/ash/common/frame/custom_frame_view_ash.cc
+++ b/ash/common/frame/custom_frame_view_ash.cc
@@ -195,6 +195,8 @@ CustomFrameViewAsh::CustomFrameViewAsh(
// |header_view_| is set as the non client view's overlay view so that it can
// overlay the web contents in immersive fullscreen.
frame->non_client_view()->SetOverlayView(new OverlayView(header_view_));
+ frame_window->SetColorProperty(WmWindowProperty::TOP_VIEW_COLOR,
+ header_view_->GetInactiveFrameColor());
// A delegate for a more complex way of fullscreening the window may already
// be set. This is the case for packaged apps.
@@ -217,6 +219,9 @@ void CustomFrameViewAsh::InitImmersiveFullscreenControllerForView(
void CustomFrameViewAsh::SetFrameColors(SkColor active_frame_color,
SkColor inactive_frame_color) {
header_view_->SetFrameColors(active_frame_color, inactive_frame_color);
+ WmWindow* frame_window = WmLookup::Get()->GetWindowForWidget(frame_);
+ frame_window->SetColorProperty(WmWindowProperty::TOP_VIEW_COLOR,
+ header_view_->GetInactiveFrameColor());
}
////////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « ash/aura/wm_window_aura.cc ('k') | ash/common/frame/default_header_painter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698