| 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/system/tray/tray_bar_button_with_title.h" | 5 #include "ash/system/tray/tray_bar_button_with_title.h" |
| 6 | 6 |
| 7 #include <memory> |
| 8 |
| 7 #include "ash/system/tray/tray_constants.h" | 9 #include "ash/system/tray/tray_constants.h" |
| 8 #include "base/memory/scoped_ptr.h" | |
| 9 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
| 10 #include "ui/gfx/image/image_skia.h" | 11 #include "ui/gfx/image/image_skia.h" |
| 11 #include "ui/resources/grit/ui_resources.h" | 12 #include "ui/resources/grit/ui_resources.h" |
| 12 #include "ui/views/controls/label.h" | 13 #include "ui/views/controls/label.h" |
| 13 #include "ui/views/painter.h" | 14 #include "ui/views/painter.h" |
| 14 #include "ui/views/resources/grit/views_resources.h" | 15 #include "ui/views/resources/grit/views_resources.h" |
| 15 | 16 |
| 16 namespace ash { | 17 namespace ash { |
| 17 namespace { | 18 namespace { |
| 18 | 19 |
| (...skipping 28 matching lines...) Expand all Loading... |
| 47 | 48 |
| 48 void Update(bool control_on) { | 49 void Update(bool control_on) { |
| 49 painter_.reset(new views::HorizontalPainter( | 50 painter_.reset(new views::HorizontalPainter( |
| 50 control_on ? bar_active_images_ : bar_disabled_images_)); | 51 control_on ? bar_active_images_ : bar_disabled_images_)); |
| 51 SchedulePaint(); | 52 SchedulePaint(); |
| 52 } | 53 } |
| 53 | 54 |
| 54 private: | 55 private: |
| 55 const int* bar_active_images_; | 56 const int* bar_active_images_; |
| 56 const int* bar_disabled_images_; | 57 const int* bar_disabled_images_; |
| 57 scoped_ptr<views::HorizontalPainter> painter_; | 58 std::unique_ptr<views::HorizontalPainter> painter_; |
| 58 | 59 |
| 59 DISALLOW_COPY_AND_ASSIGN(TrayBarButton); | 60 DISALLOW_COPY_AND_ASSIGN(TrayBarButton); |
| 60 }; | 61 }; |
| 61 | 62 |
| 62 TrayBarButtonWithTitle::TrayBarButtonWithTitle(views::ButtonListener* listener, | 63 TrayBarButtonWithTitle::TrayBarButtonWithTitle(views::ButtonListener* listener, |
| 63 int title_id, | 64 int title_id, |
| 64 int width) | 65 int width) |
| 65 : views::CustomButton(listener), | 66 : views::CustomButton(listener), |
| 66 image_(new TrayBarButton(kBarImagesActive, kBarImagesDisabled)), | 67 image_(new TrayBarButton(kBarImagesActive, kBarImagesDisabled)), |
| 67 title_(NULL), | 68 title_(NULL), |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 // a little bit up to look closer to the bar. | 103 // a little bit up to look closer to the bar. |
| 103 gfx::Size title_size = title_->GetPreferredSize(); | 104 gfx::Size title_size = title_->GetPreferredSize(); |
| 104 title_->SetBounds(rect.x(), | 105 title_->SetBounds(rect.x(), |
| 105 bar_image_y + image_height_ - 3, | 106 bar_image_y + image_height_ - 3, |
| 106 rect.width(), | 107 rect.width(), |
| 107 title_size.height()); | 108 title_size.height()); |
| 108 } | 109 } |
| 109 } | 110 } |
| 110 | 111 |
| 111 } // namespace ash | 112 } // namespace ash |
| OLD | NEW |