| Index: ash/frame/caption_buttons/frame_caption_button_container_view.cc
|
| diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view.cc b/ash/frame/caption_buttons/frame_caption_button_container_view.cc
|
| index 4a59a6bad04758d03751829d411d3f2029330e12..d500513b8bb6c41a523d80c451684dcf1876b20b 100644
|
| --- a/ash/frame/caption_buttons/frame_caption_button_container_view.cc
|
| +++ b/ash/frame/caption_buttons/frame_caption_button_container_view.cc
|
| @@ -22,6 +22,7 @@
|
| #include "ui/gfx/canvas.h"
|
| #include "ui/gfx/geometry/insets.h"
|
| #include "ui/gfx/geometry/point.h"
|
| +#include "ui/gfx/vector_icons_public.h"
|
| #include "ui/strings/grit/ui_strings.h" // Accessibility names
|
| #include "ui/views/widget/widget.h"
|
| #include "ui/views/widget/widget_delegate.h"
|
| @@ -149,8 +150,9 @@ void FrameCaptionButtonContainerView::TestApi::EndAnimations() {
|
| container_view_->maximize_mode_animation_->End();
|
| }
|
|
|
| -void FrameCaptionButtonContainerView::SetButtonImage(CaptionButtonIcon icon,
|
| - int icon_image_id) {
|
| +void FrameCaptionButtonContainerView::SetButtonImage(
|
| + CaptionButtonIcon icon,
|
| + gfx::VectorIconId icon_image_id) {
|
| button_icon_id_map_[icon] = icon_image_id;
|
|
|
| FrameCaptionButton* buttons[] = {
|
| @@ -168,6 +170,12 @@ void FrameCaptionButtonContainerView::SetPaintAsActive(bool paint_as_active) {
|
| close_button_->set_paint_as_active(paint_as_active);
|
| }
|
|
|
| +void FrameCaptionButtonContainerView::SetUseLightImages(bool light) {
|
| + minimize_button_->set_use_light_images(light);
|
| + size_button_->set_use_light_images(light);
|
| + close_button_->set_use_light_images(light);
|
| +}
|
| +
|
| void FrameCaptionButtonContainerView::ResetWindowControls() {
|
| SetButtonsToNormal(ANIMATE_NO);
|
| }
|
|
|