| OLD | NEW |
| 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 #include "ash/common/shelf/wm_shelf_observer.h" | 6 #include "ash/common/shelf/wm_shelf_observer.h" |
| 7 #include "ash/common/wm_lookup.h" | 7 #include "ash/common/wm_lookup.h" |
| 8 #include "ash/shelf/shelf.h" | 8 #include "ash/shelf/shelf.h" |
| 9 #include "ash/shelf/shelf_layout_manager.h" | 9 #include "ash/shelf/shelf_layout_manager.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 | 99 |
| 100 WmDimmerView* WmShelf::CreateDimmerView(bool disable_animations_for_test) { | 100 WmDimmerView* WmShelf::CreateDimmerView(bool disable_animations_for_test) { |
| 101 return nullptr; | 101 return nullptr; |
| 102 } | 102 } |
| 103 | 103 |
| 104 bool WmShelf::IsDimmed() const { | 104 bool WmShelf::IsDimmed() const { |
| 105 return shelf_layout_manager_->shelf_widget()->GetDimsShelf(); | 105 return shelf_layout_manager_->shelf_widget()->GetDimsShelf(); |
| 106 } | 106 } |
| 107 | 107 |
| 108 bool WmShelf::IsVisible() const { | 108 bool WmShelf::IsVisible() const { |
| 109 return shelf_->IsVisible(); | 109 return shelf_->shelf_widget()->IsShelfVisible(); |
| 110 } | 110 } |
| 111 | 111 |
| 112 void WmShelf::UpdateVisibilityState() { | 112 void WmShelf::UpdateVisibilityState() { |
| 113 if (shelf_layout_manager_) | 113 if (shelf_layout_manager_) |
| 114 shelf_layout_manager_->UpdateVisibilityState(); | 114 shelf_layout_manager_->UpdateVisibilityState(); |
| 115 } | 115 } |
| 116 | 116 |
| 117 ShelfVisibilityState WmShelf::GetVisibilityState() const { | 117 ShelfVisibilityState WmShelf::GetVisibilityState() const { |
| 118 return shelf_layout_manager_ ? shelf_layout_manager_->visibility_state() | 118 return shelf_layout_manager_ ? shelf_layout_manager_->visibility_state() |
| 119 : SHELF_HIDDEN; | 119 : SHELF_HIDDEN; |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 | 193 |
| 194 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type, | 194 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type, |
| 195 BackgroundAnimatorChangeType change_type) { | 195 BackgroundAnimatorChangeType change_type) { |
| 196 if (background_type == GetBackgroundType()) | 196 if (background_type == GetBackgroundType()) |
| 197 return; | 197 return; |
| 198 FOR_EACH_OBSERVER(WmShelfObserver, observers_, | 198 FOR_EACH_OBSERVER(WmShelfObserver, observers_, |
| 199 OnBackgroundTypeChanged(background_type, change_type)); | 199 OnBackgroundTypeChanged(background_type, change_type)); |
| 200 } | 200 } |
| 201 | 201 |
| 202 } // namespace ash | 202 } // namespace ash |
| OLD | NEW |