Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ash / wm / panels / panel_frame_view.cc

diff --git a/src/ash/wm/panels/panel_frame_view.cc b/src/ash/wm/panels/panel_frame_view.cc
index 24e37b5..4f27091 100644 (file)
--- a/src/ash/wm/panels/panel_frame_view.cc
+++ b/src/ash/wm/panels/panel_frame_view.cc
@@ -43,12 +43,13 @@ 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_);
   }
-
-  header_painter_->Init(frame_, this, window_icon_, caption_button_container_);
 }
 
 int PanelFrameView::NonClientTopBorderHeight() const {
@@ -96,6 +97,9 @@ void PanelFrameView::UpdateWindowTitle() {
   header_painter_->SchedulePaintForTitle();
 }
 
+void PanelFrameView::SizeConstraintsChanged() {
+}
+
 int PanelFrameView::NonClientHitTest(const gfx::Point& point) {
   if (!header_painter_)
     return HTNOWHERE;