| 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/aura/wm_shelf_aura.h" | 5 #include "ash/aura/wm_shelf_aura.h" |
| 6 | 6 |
| 7 #include "ash/aura/wm_window_aura.h" | 7 #include "ash/aura/wm_window_aura.h" |
| 8 #include "ash/common/shelf/wm_shelf_observer.h" | 8 #include "ash/common/shelf/wm_shelf_observer.h" |
| 9 #include "ash/common/wm_window.h" | 9 #include "ash/common/wm_window.h" |
| 10 #include "ash/shelf/shelf.h" | 10 #include "ash/shelf/shelf.h" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 } | 85 } |
| 86 | 86 |
| 87 ShelfBackgroundType WmShelfAura::GetBackgroundType() const { | 87 ShelfBackgroundType WmShelfAura::GetBackgroundType() const { |
| 88 return shelf_layout_manager_->shelf_widget()->GetBackgroundType(); | 88 return shelf_layout_manager_->shelf_widget()->GetBackgroundType(); |
| 89 } | 89 } |
| 90 | 90 |
| 91 bool WmShelfAura::IsDimmed() const { | 91 bool WmShelfAura::IsDimmed() const { |
| 92 return shelf_layout_manager_->shelf_widget()->GetDimsShelf(); | 92 return shelf_layout_manager_->shelf_widget()->GetDimsShelf(); |
| 93 } | 93 } |
| 94 | 94 |
| 95 bool WmShelfAura::IsShowingOverflowBubble() const { |
| 96 return shelf_->IsShowingOverflowBubble(); |
| 97 } |
| 98 |
| 99 void WmShelfAura::SchedulePaint() { |
| 100 // Can be called during shutdown if the overflow bubble is visible. |
| 101 if (shelf_) |
| 102 shelf_->SchedulePaint(); |
| 103 } |
| 104 |
| 95 bool WmShelfAura::IsVisible() const { | 105 bool WmShelfAura::IsVisible() const { |
| 96 return shelf_->IsVisible(); | 106 return shelf_->IsVisible(); |
| 97 } | 107 } |
| 98 | 108 |
| 99 void WmShelfAura::UpdateVisibilityState() { | 109 void WmShelfAura::UpdateVisibilityState() { |
| 100 shelf_layout_manager_->UpdateVisibilityState(); | 110 shelf_layout_manager_->UpdateVisibilityState(); |
| 101 } | 111 } |
| 102 | 112 |
| 103 ShelfVisibilityState WmShelfAura::GetVisibilityState() const { | 113 ShelfVisibilityState WmShelfAura::GetVisibilityState() const { |
| 104 return shelf_layout_manager_ ? shelf_layout_manager_->visibility_state() | 114 return shelf_layout_manager_ ? shelf_layout_manager_->visibility_state() |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 void WmShelfAura::OnAutoHideStateChanged(ShelfAutoHideState new_state) { | 182 void WmShelfAura::OnAutoHideStateChanged(ShelfAutoHideState new_state) { |
| 173 FOR_EACH_OBSERVER(WmShelfObserver, observers_, | 183 FOR_EACH_OBSERVER(WmShelfObserver, observers_, |
| 174 OnAutoHideStateChanged(new_state)); | 184 OnAutoHideStateChanged(new_state)); |
| 175 } | 185 } |
| 176 | 186 |
| 177 void WmShelfAura::OnShelfIconPositionsChanged() { | 187 void WmShelfAura::OnShelfIconPositionsChanged() { |
| 178 FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged()); | 188 FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged()); |
| 179 } | 189 } |
| 180 | 190 |
| 181 } // namespace ash | 191 } // namespace ash |
| OLD | NEW |