Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Unified Diff: ash/frame/header_view.h

Issue 2910773002: cros: CustomFrameViewAsh avatar icon from a window prop (Closed)
Patch Set: rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/frame/header_view.h
diff --git a/ash/frame/header_view.h b/ash/frame/header_view.h
index 4d59fedcf2bedd81d285c218ae60b1056b38884b..f0e1e5607d404e60d871ea6466ee443ef78537f7 100644
--- a/ash/frame/header_view.h
+++ b/ash/frame/header_view.h
@@ -6,6 +6,7 @@
#define ASH_FRAME_HEADER_VIEW_H_
#include <memory>
+#include <vector>
James Cook 2017/05/30 21:27:15 super nit: not needed, comes from interface declar
xiyuan 2017/05/30 22:44:14 Removed. Added those because "git cl lint" complai
#include "ash/ash_export.h"
#include "ash/public/interfaces/window_style.mojom.h"
@@ -15,6 +16,11 @@
#include "third_party/skia/include/core/SkColor.h"
#include "ui/views/view.h"
+namespace gfx {
+class Canvas;
James Cook 2017/05/30 21:27:15 super nit: not needed (comes from interface declar
xiyuan 2017/05/30 22:44:14 Removed.
+class ImageSkia;
+}
+
namespace views {
class ImageView;
class Widget;
@@ -58,7 +64,8 @@ class ASH_EXPORT HeaderView : public views::View,
// Returns the view's minimum width.
int GetMinimumWidth() const;
- void UpdateAvatarIcon();
+ // Sets the avatar icon to be displayed on the frame header.
+ void SetAvatarIcon(const gfx::ImageSkia& avatar);
void SizeConstraintsChanged();

Powered by Google App Engine
This is Rietveld 408576698