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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/wm/overview/window_grid.cc

Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf (Closed)
Patch Set: rebase again Created 4 years, 4 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/wm/immersive_context_ash.cc ('k') | ash/common/wm/overview/window_selector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/overview/window_grid.cc
diff --git a/ash/common/wm/overview/window_grid.cc b/ash/common/wm/overview/window_grid.cc
index 95219a312933623378ccc4fe5a5a49196d03197e..17c5ceb23b9058d3ed4dfb179b77c5e577ccbce6 100644
--- a/ash/common/wm/overview/window_grid.cc
+++ b/ash/common/wm/overview/window_grid.cc
@@ -845,9 +845,8 @@ void WindowGrid::InitShieldWidget() {
// synonymous with a black shelf background. Update this code if that
// assumption is no longer valid.
const float initial_opacity =
- (root_window_->GetRootWindowController()
- ->GetShelf()
- ->GetBackgroundType() == SHELF_BACKGROUND_MAXIMIZED)
+ (WmShelf::ForWindow(root_window_)->GetBackgroundType() ==
+ SHELF_BACKGROUND_MAXIMIZED)
? 1.f
: 0.f;
shield_widget_.reset(CreateBackgroundWidget(
« no previous file with comments | « ash/common/wm/immersive_context_ash.cc ('k') | ash/common/wm/overview/window_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698