| Index: ash/frame/custom_frame_view_ash.cc
|
| diff --git a/ash/frame/custom_frame_view_ash.cc b/ash/frame/custom_frame_view_ash.cc
|
| index eb20914cc84e356b09b1bd3f4cdb0ad53d2ba1c9..31d5772bb70bd868ac07c2d67f7a7f86e76bbd8a 100644
|
| --- a/ash/frame/custom_frame_view_ash.cc
|
| +++ b/ash/frame/custom_frame_view_ash.cc
|
| @@ -13,6 +13,7 @@
|
| #include "ash/frame/frame_border_hit_test_controller.h"
|
| #include "ash/frame/frame_util.h"
|
| #include "ash/frame/header_painter.h"
|
| +#include "ash/frame/header_painter_util.h"
|
| #include "ash/session/session_state_delegate.h"
|
| #include "ash/shell.h"
|
| #include "ash/shell_observer.h"
|
| @@ -211,7 +212,7 @@ CustomFrameViewAsh::HeaderView::HeaderView(views::Widget* frame)
|
| caption_button_container_->UpdateSizeButtonVisibility();
|
| AddChildView(caption_button_container_);
|
|
|
| - header_painter_->Init(frame_, this, NULL, caption_button_container_);
|
| + header_painter_->Init(frame_, this, caption_button_container_);
|
| UpdateAvatarIcon();
|
|
|
| Shell::GetInstance()->AddShellObserver(this);
|
| @@ -268,7 +269,7 @@ void CustomFrameViewAsh::HeaderView::UpdateAvatarIcon() {
|
| avatar_icon_->SetImage(image);
|
| icon_size = image.width();
|
| }
|
| - header_painter_->UpdateWindowIcon(avatar_icon_, icon_size);
|
| + header_painter_->UpdateLeftHeaderView(avatar_icon_, icon_size);
|
| Layout();
|
| }
|
|
|
|
|