OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/shelf/shelf_widget.h" | 5 #include "ash/shelf/shelf_widget.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/focus_cycler.h" | 8 #include "ash/focus_cycler.h" |
9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
10 #include "ash/session/session_state_delegate.h" | 10 #include "ash/session/session_state_delegate.h" |
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
710 status_area_widget_->SetShelfAlignment(alignment); | 710 status_area_widget_->SetShelfAlignment(alignment); |
711 delegate_view_->SchedulePaint(); | 711 delegate_view_->SchedulePaint(); |
712 } | 712 } |
713 | 713 |
714 void ShelfWidget::SetDimsShelf(bool dimming) { | 714 void ShelfWidget::SetDimsShelf(bool dimming) { |
715 delegate_view_->SetDimmed(dimming); | 715 delegate_view_->SetDimmed(dimming); |
716 // Repaint all children, allowing updates to reflect dimmed state eg: | 716 // Repaint all children, allowing updates to reflect dimmed state eg: |
717 // status area background, app list button and overflow button. | 717 // status area background, app list button and overflow button. |
718 if (shelf_) | 718 if (shelf_) |
719 shelf_->SchedulePaint(); | 719 shelf_->SchedulePaint(); |
720 status_area_widget_->GetContentsView()->SchedulePaint(); | 720 status_area_widget_->SchedulePaint(); |
oshima
2014/05/31 15:10:36
won't GetNativeView()->SchedulePaintInRect() work?
jonross
2014/06/02 14:57:09
That call does not work. It also finds the current
| |
721 } | 721 } |
722 | 722 |
723 bool ShelfWidget::GetDimsShelf() const { | 723 bool ShelfWidget::GetDimsShelf() const { |
724 return delegate_view_->GetDimmed(); | 724 return delegate_view_->GetDimmed(); |
725 } | 725 } |
726 | 726 |
727 void ShelfWidget::CreateShelf() { | 727 void ShelfWidget::CreateShelf() { |
728 if (shelf_) | 728 if (shelf_) |
729 return; | 729 return; |
730 | 730 |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
801 DCHECK(delegate_view_); | 801 DCHECK(delegate_view_); |
802 return delegate_view_->disable_dimming_animations_for_test(); | 802 return delegate_view_->disable_dimming_animations_for_test(); |
803 } | 803 } |
804 | 804 |
805 void ShelfWidget::WillDeleteShelf() { | 805 void ShelfWidget::WillDeleteShelf() { |
806 shelf_layout_manager_->RemoveObserver(this); | 806 shelf_layout_manager_->RemoveObserver(this); |
807 shelf_layout_manager_ = NULL; | 807 shelf_layout_manager_ = NULL; |
808 } | 808 } |
809 | 809 |
810 } // namespace ash | 810 } // namespace ash |
OLD | NEW |