| 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/dimmer_view.h" | 10 #include "ash/shelf/dimmer_view.h" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 } | 122 } |
| 123 | 123 |
| 124 WmDimmerView* WmShelfAura::CreateDimmerView(bool disable_animations_for_test) { | 124 WmDimmerView* WmShelfAura::CreateDimmerView(bool disable_animations_for_test) { |
| 125 return DimmerView::Create(this, disable_animations_for_test); | 125 return DimmerView::Create(this, disable_animations_for_test); |
| 126 } | 126 } |
| 127 | 127 |
| 128 bool WmShelfAura::IsDimmed() const { | 128 bool WmShelfAura::IsDimmed() const { |
| 129 return shelf_layout_manager_->shelf_widget()->GetDimsShelf(); | 129 return shelf_layout_manager_->shelf_widget()->GetDimsShelf(); |
| 130 } | 130 } |
| 131 | 131 |
| 132 bool WmShelfAura::IsShowingOverflowBubble() const { | |
| 133 return shelf_->IsShowingOverflowBubble(); | |
| 134 } | |
| 135 | |
| 136 void WmShelfAura::SchedulePaint() { | 132 void WmShelfAura::SchedulePaint() { |
| 137 // Can be called during shutdown if the overflow bubble is visible. | 133 // Can be called during shutdown if the overflow bubble is visible. |
| 138 if (shelf_) | 134 if (shelf_) |
| 139 shelf_->SchedulePaint(); | 135 shelf_->SchedulePaint(); |
| 140 } | 136 } |
| 141 | 137 |
| 142 bool WmShelfAura::IsVisible() const { | 138 bool WmShelfAura::IsVisible() const { |
| 143 return shelf_->IsVisible(); | 139 return shelf_->IsVisible(); |
| 144 } | 140 } |
| 145 | 141 |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 void WmShelfAura::OnAutoHideStateChanged(ShelfAutoHideState new_state) { | 221 void WmShelfAura::OnAutoHideStateChanged(ShelfAutoHideState new_state) { |
| 226 FOR_EACH_OBSERVER(WmShelfObserver, observers_, | 222 FOR_EACH_OBSERVER(WmShelfObserver, observers_, |
| 227 OnAutoHideStateChanged(new_state)); | 223 OnAutoHideStateChanged(new_state)); |
| 228 } | 224 } |
| 229 | 225 |
| 230 void WmShelfAura::OnShelfIconPositionsChanged() { | 226 void WmShelfAura::OnShelfIconPositionsChanged() { |
| 231 FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged()); | 227 FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged()); |
| 232 } | 228 } |
| 233 | 229 |
| 234 } // namespace ash | 230 } // namespace ash |
| OLD | NEW |