OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_button.h" | 5 #include "ash/shelf/shelf_button.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/ash_constants.h" | 9 #include "ash/ash_constants.h" |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
11 #include "ash/common/material_design/material_design_controller.h" | 11 #include "ash/common/material_design/material_design_controller.h" |
12 #include "ash/common/shelf/shelf_constants.h" | 12 #include "ash/common/shelf/shelf_constants.h" |
13 #include "ash/shelf/shelf.h" | 13 #include "ash/shelf/shelf.h" |
14 #include "ash/shelf/shelf_view.h" | 14 #include "ash/shelf/shelf_view.h" |
15 #include "base/time/time.h" | 15 #include "base/time/time.h" |
16 #include "grit/ash_resources.h" | 16 #include "grit/ash_resources.h" |
17 #include "skia/ext/image_operations.h" | 17 #include "skia/ext/image_operations.h" |
18 #include "third_party/skia/include/core/SkPaint.h" | 18 #include "third_party/skia/include/core/SkPaint.h" |
| 19 #include "ui/accessibility/ax_enums.h" |
19 #include "ui/accessibility/ax_view_state.h" | 20 #include "ui/accessibility/ax_view_state.h" |
20 #include "ui/base/resource/resource_bundle.h" | 21 #include "ui/base/resource/resource_bundle.h" |
21 #include "ui/compositor/layer.h" | 22 #include "ui/compositor/layer.h" |
22 #include "ui/compositor/scoped_layer_animation_settings.h" | 23 #include "ui/compositor/scoped_layer_animation_settings.h" |
23 #include "ui/events/event_constants.h" | 24 #include "ui/events/event_constants.h" |
24 #include "ui/gfx/animation/animation_delegate.h" | 25 #include "ui/gfx/animation/animation_delegate.h" |
25 #include "ui/gfx/animation/throb_animation.h" | 26 #include "ui/gfx/animation/throb_animation.h" |
26 #include "ui/gfx/canvas.h" | 27 #include "ui/gfx/canvas.h" |
27 #include "ui/gfx/geometry/vector2d.h" | 28 #include "ui/gfx/geometry/vector2d.h" |
28 #include "ui/gfx/image/image.h" | 29 #include "ui/gfx/image/image.h" |
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
529 views::ImageView::TRAILING)); | 530 views::ImageView::TRAILING)); |
530 bar_->SetVerticalAlignment(shelf->SelectValueForShelfAlignment( | 531 bar_->SetVerticalAlignment(shelf->SelectValueForShelfAlignment( |
531 views::ImageView::TRAILING, views::ImageView::CENTER, | 532 views::ImageView::TRAILING, views::ImageView::CENTER, |
532 views::ImageView::CENTER)); | 533 views::ImageView::CENTER)); |
533 bar_->SchedulePaint(); | 534 bar_->SchedulePaint(); |
534 } | 535 } |
535 bar_->SetVisible(bar_id != 0 && state_ != STATE_NORMAL); | 536 bar_->SetVisible(bar_id != 0 && state_ != STATE_NORMAL); |
536 } | 537 } |
537 | 538 |
538 } // namespace ash | 539 } // namespace ash |
OLD | NEW |