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

Side by Side Diff: ash/common/shelf/wm_shelf.cc

Issue 2550413004: Remove Ash shelf dimmer. (Closed)
Patch Set: jamescook review 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
« no previous file with comments | « ash/common/shelf/wm_shelf.h ('k') | ash/common/system/tray/tray_background_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/shelf/wm_shelf.h" 5 #include "ash/common/shelf/wm_shelf.h"
6 6
7 #include "ash/common/shelf/shelf_controller.h" 7 #include "ash/common/shelf/shelf_controller.h"
8 #include "ash/common/shelf/shelf_delegate.h" 8 #include "ash/common/shelf/shelf_delegate.h"
9 #include "ash/common/shelf/shelf_item_delegate.h" 9 #include "ash/common/shelf/shelf_item_delegate.h"
10 #include "ash/common/shelf/shelf_layout_manager.h" 10 #include "ash/common/shelf/shelf_layout_manager.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 } 193 }
194 194
195 void WmShelf::UpdateAutoHideState() { 195 void WmShelf::UpdateAutoHideState() {
196 shelf_layout_manager_->UpdateAutoHideState(); 196 shelf_layout_manager_->UpdateAutoHideState();
197 } 197 }
198 198
199 ShelfBackgroundType WmShelf::GetBackgroundType() const { 199 ShelfBackgroundType WmShelf::GetBackgroundType() const {
200 return shelf_widget_->GetBackgroundType(); 200 return shelf_widget_->GetBackgroundType();
201 } 201 }
202 202
203 WmDimmerView* WmShelf::CreateDimmerView(bool disable_animations_for_test) {
204 return nullptr;
205 }
206
207 bool WmShelf::IsDimmed() const {
208 return shelf_widget_->GetDimsShelf();
209 }
210
211 bool WmShelf::IsVisible() const { 203 bool WmShelf::IsVisible() const {
212 return shelf_widget_->IsShelfVisible(); 204 return shelf_widget_->IsShelfVisible();
213 } 205 }
214 206
215 void WmShelf::UpdateVisibilityState() { 207 void WmShelf::UpdateVisibilityState() {
216 if (shelf_layout_manager_) 208 if (shelf_layout_manager_)
217 shelf_layout_manager_->UpdateVisibilityState(); 209 shelf_layout_manager_->UpdateVisibilityState();
218 } 210 }
219 211
220 ShelfVisibilityState WmShelf::GetVisibilityState() const { 212 ShelfVisibilityState WmShelf::GetVisibilityState() const {
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 331
340 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type, 332 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type,
341 BackgroundAnimatorChangeType change_type) { 333 BackgroundAnimatorChangeType change_type) {
342 if (background_type == GetBackgroundType()) 334 if (background_type == GetBackgroundType())
343 return; 335 return;
344 for (auto& observer : observers_) 336 for (auto& observer : observers_)
345 observer.OnBackgroundTypeChanged(background_type, change_type); 337 observer.OnBackgroundTypeChanged(background_type, change_type);
346 } 338 }
347 339
348 } // namespace ash 340 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/shelf/wm_shelf.h ('k') | ash/common/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698