Index: ash/frame/header_painter.h |
diff --git a/ash/frame/header_painter.h b/ash/frame/header_painter.h |
index 520758310d50c8b7b6a68342521dbedaaae0e5cd..130fc4d87dffe37848e89079f2653257a98b4c51 100644 |
--- a/ash/frame/header_painter.h |
+++ b/ash/frame/header_painter.h |
@@ -56,6 +56,10 @@ class ASH_EXPORT HeaderPainter : public gfx::AnimationDelegate { |
views::View* window_icon, |
FrameCaptionButtonContainerView* caption_button_container); |
+ // Sets the window icon to the header. Passing NULL removes the window icon. |
+ void UpdateWindowIcon(views::View* window_icon, |
+ const gfx::Size& window_icon_size); |
pkotwicz
2014/03/18 04:41:15
Can you please merge with https://codereview.chrom
oshima
2014/03/18 14:57:03
done
|
+ |
// Returns the bounds of the client view for a window with |header_height| |
// and |window_bounds|. The return value and |window_bounds| are in the |
// views::NonClientView's coordinates. |
@@ -160,6 +164,7 @@ class ASH_EXPORT HeaderPainter : public gfx::AnimationDelegate { |
views::Widget* frame_; |
views::View* header_view_; |
views::View* window_icon_; // May be NULL. |
+ gfx::Size window_icon_size_; |
FrameCaptionButtonContainerView* caption_button_container_; |
// The height of the header. |