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

Unified Diff: ash/system/status_area_widget_delegate.h

Issue 1998933002: Update shelf spacing in Chrome OS according to the MD specs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge Created 4 years, 6 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/system/status_area_widget_delegate.h
diff --git a/ash/system/status_area_widget_delegate.h b/ash/system/status_area_widget_delegate.h
index 4dfa668787e1eede699f656389d455502461aeb9..7ecf7980640477d29541104bbde16f2617212731 100644
--- a/ash/system/status_area_widget_delegate.h
+++ b/ash/system/status_area_widget_delegate.h
@@ -14,6 +14,10 @@
#include "ui/views/widget/widget_delegate.h"
namespace ash {
tdanderson 2016/06/10 22:54:43 you don't need/want both line 16 and line 20
yiyix 2016/06/13 18:43:55 Done.
+class TrayBackgroundView;
+}
+
+namespace ash {
class FocusCycler;
class ASH_EXPORT StatusAreaWidgetDelegate : public views::AccessiblePaneView,
@@ -23,7 +27,7 @@ class ASH_EXPORT StatusAreaWidgetDelegate : public views::AccessiblePaneView,
~StatusAreaWidgetDelegate() override;
// Add a tray view to the widget (e.g. system tray, web notifications).
- void AddTray(views::View* tray);
+ void AddTray(TrayBackgroundView* tray);
tdanderson 2016/06/10 22:54:43 I was looking over the chat you, me, and Ben had l
yiyix 2016/06/13 18:43:55 I did not really like the casting. I am glad that
// Called whenever layout might change (e.g. alignment changed).
void UpdateLayout();
@@ -55,6 +59,11 @@ class ASH_EXPORT StatusAreaWidgetDelegate : public views::AccessiblePaneView,
private:
void UpdateWidgetSize();
+ // Tray shows on the right most edge requires an extra wide inset, so edge is
tdanderson 2016/06/10 22:54:43 nit on wording, change to something like: "Sets a
yiyix 2016/06/13 18:43:55 Done.
+ // included the hitting area .
+ void SetBorderOnEdgeTray(views::View* child);
+ void SetBorderOnNonEdgeTray(views::View* child);
tdanderson 2016/06/10 22:54:43 Combine into a single function, such as: void Set
yiyix 2016/06/13 18:43:55 Done.
+
const FocusCycler* focus_cycler_for_testing_;
ShelfAlignment alignment_;

Powered by Google App Engine
This is Rietveld 408576698