| Index: ash/wm/panels/panel_frame_view.cc
|
| diff --git a/ash/wm/panels/panel_frame_view.cc b/ash/wm/panels/panel_frame_view.cc
|
| index a6e082270a0516143b2868bf13fc9ffefaf41954..4be58c4903eea5ed36decaaf982f46c213222187 100644
|
| --- a/ash/wm/panels/panel_frame_view.cc
|
| +++ b/ash/wm/panels/panel_frame_view.cc
|
| @@ -7,6 +7,7 @@
|
| #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
|
| #include "ash/frame/default_header_painter.h"
|
| #include "ash/frame/frame_border_hit_test_controller.h"
|
| +#include "ash/frame/header_painter_util.h"
|
| #include "grit/ash_resources.h"
|
| #include "ui/base/hit_test.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| @@ -45,12 +46,14 @@ void PanelFrameView::InitHeaderPainter() {
|
| FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
|
| AddChildView(caption_button_container_);
|
|
|
| + header_painter_->Init(frame_, this, caption_button_container_);
|
| +
|
| if (frame_->widget_delegate()->ShouldShowWindowIcon()) {
|
| window_icon_ = new views::ImageView();
|
| AddChildView(window_icon_);
|
| + header_painter_->UpdateLeftHeaderView(
|
| + window_icon_, HeaderPainterUtil::GetDefaultIconSize());
|
| }
|
| -
|
| - header_painter_->Init(frame_, this, window_icon_, caption_button_container_);
|
| }
|
|
|
| int PanelFrameView::NonClientTopBorderHeight() const {
|
|
|