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/common/shelf/shelf_button.h" | 5 #include "ash/common/shelf/shelf_button.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/common/ash_constants.h" | 9 #include "ash/common/ash_constants.h" |
10 #include "ash/common/material_design/material_design_controller.h" | 10 #include "ash/common/material_design/material_design_controller.h" |
11 #include "ash/common/shelf/ink_drop_button_listener.h" | 11 #include "ash/common/shelf/ink_drop_button_listener.h" |
12 #include "ash/common/shelf/shelf_constants.h" | 12 #include "ash/common/shelf/shelf_constants.h" |
13 #include "ash/common/shelf/shelf_view.h" | 13 #include "ash/common/shelf/shelf_view.h" |
14 #include "ash/common/shelf/wm_shelf.h" | 14 #include "ash/common/shelf/wm_shelf.h" |
15 #include "ash/common/shelf/wm_shelf_util.h" | 15 #include "ash/common/shelf/wm_shelf_util.h" |
| 16 #include "base/memory/ptr_util.h" |
16 #include "base/time/time.h" | 17 #include "base/time/time.h" |
17 #include "grit/ash_resources.h" | 18 #include "grit/ash_resources.h" |
18 #include "skia/ext/image_operations.h" | 19 #include "skia/ext/image_operations.h" |
19 #include "third_party/skia/include/core/SkPaint.h" | 20 #include "third_party/skia/include/core/SkPaint.h" |
20 #include "ui/accessibility/ax_node_data.h" | 21 #include "ui/accessibility/ax_node_data.h" |
21 #include "ui/base/resource/resource_bundle.h" | 22 #include "ui/base/resource/resource_bundle.h" |
22 #include "ui/compositor/layer.h" | 23 #include "ui/compositor/layer.h" |
23 #include "ui/compositor/scoped_layer_animation_settings.h" | 24 #include "ui/compositor/scoped_layer_animation_settings.h" |
24 #include "ui/events/event_constants.h" | 25 #include "ui/events/event_constants.h" |
25 #include "ui/gfx/animation/animation_delegate.h" | 26 #include "ui/gfx/animation/animation_delegate.h" |
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
597 bar_->SetHorizontalAlignment(views::ImageView::TRAILING); | 598 bar_->SetHorizontalAlignment(views::ImageView::TRAILING); |
598 bar_->SetVerticalAlignment(views::ImageView::CENTER); | 599 bar_->SetVerticalAlignment(views::ImageView::CENTER); |
599 break; | 600 break; |
600 } | 601 } |
601 bar_->SchedulePaint(); | 602 bar_->SchedulePaint(); |
602 } | 603 } |
603 bar_->SetVisible(bar_id != 0 && state_ != STATE_NORMAL); | 604 bar_->SetVisible(bar_id != 0 && state_ != STATE_NORMAL); |
604 } | 605 } |
605 | 606 |
606 } // namespace ash | 607 } // namespace ash |
OLD | NEW |