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

Unified Diff: ash/common/wm/dock/docked_window_layout_manager.cc

Issue 2679133003: [ash-md] Wired in the Shelf color to be derived from the Wallpaper. (Closed)
Patch Set: Addressed nits. Created 3 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/common/wallpaper/wallpaper_controller_observer.h ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/dock/docked_window_layout_manager.cc
diff --git a/ash/common/wm/dock/docked_window_layout_manager.cc b/ash/common/wm/dock/docked_window_layout_manager.cc
index 3e620c3f0950099521b0aa483c9e5045aeddac23..fb6a220019502281c1c332080a21c42415ed828d 100644
--- a/ash/common/wm/dock/docked_window_layout_manager.cc
+++ b/ash/common/wm/dock/docked_window_layout_manager.cc
@@ -56,7 +56,9 @@ class DockedBackgroundWidget : public views::Widget,
explicit DockedBackgroundWidget(DockedWindowLayoutManager* manager)
: manager_(manager),
alignment_(DOCKED_ALIGNMENT_NONE),
- background_animator_(SHELF_BACKGROUND_DEFAULT, nullptr),
+ background_animator_(SHELF_BACKGROUND_DEFAULT,
+ nullptr,
+ WmShell::Get()->wallpaper_controller()),
opaque_background_(ui::LAYER_SOLID_COLOR),
visible_background_type_(manager_->shelf()->GetBackgroundType()),
visible_background_change_type_(AnimationChangeType::IMMEDIATE) {
@@ -86,9 +88,8 @@ class DockedBackgroundWidget : public views::Widget,
}
// ShelfBackgroundAnimatorObserver:
- void UpdateShelfBackground(int alpha) override {
- const float kMaxAlpha = 255.0f;
- opaque_background_.SetOpacity(alpha / kMaxAlpha);
+ void UpdateShelfBackground(SkColor color) override {
+ opaque_background_.SetColor(color);
}
// WmShelfObserver:
« no previous file with comments | « ash/common/wallpaper/wallpaper_controller_observer.h ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698