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

Unified Diff: ash/shelf/shelf_layout_manager.cc

Issue 2190773003: [ABANDONED] Simplify ash shelf dimmer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restore an EventHandler object; fix behavior tests. Created 4 years, 5 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
Index: ash/shelf/shelf_layout_manager.cc
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
index 93788749a62681cf0fe7bea47b9cbc29f3f9f978..00e27b3589d80871f16fedb48f939c3fc0f4d994 100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/shelf/shelf_layout_manager.cc
@@ -654,10 +654,6 @@ void ShelfLayoutManager::SetState(ShelfVisibilityState visibility_state) {
UpdateShelfBackground(change_type);
}
- shelf_widget_->SetDimsShelf(state.visibility_state == SHELF_VISIBLE &&
- state.window_state ==
- wm::WORKSPACE_WINDOW_STATE_MAXIMIZED);
-
TargetBounds target_bounds;
CalculateTargetBounds(state_, &target_bounds);
UpdateBoundsAndOpacity(target_bounds, true, delay_background_change
@@ -959,6 +955,9 @@ void ShelfLayoutManager::UpdateShelfBackground(
}
ShelfBackgroundType ShelfLayoutManager::GetShelfBackgroundType() const {
+ LOG(ERROR) << "MSW GetShelfBackgroundType " << shelf_widget_
+ << " vis:" << (state_.visibility_state != SHELF_AUTO_HIDE)
+ << " max:" << (state_.window_state == wm::WORKSPACE_WINDOW_STATE_MAXIMIZED);
if (state_.visibility_state != SHELF_AUTO_HIDE &&
state_.window_state == wm::WORKSPACE_WINDOW_STATE_MAXIMIZED) {
return SHELF_BACKGROUND_MAXIMIZED;
« no previous file with comments | « ash/resources/default_200_percent/common/shelf/shelf_dimming.png ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698