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

Unified Diff: ash/common/system/tray/system_tray.h

Issue 2147143002: [Chrome OS MD] Draw a 1px separator between 2 tray items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 4 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/common/system/tray/system_tray.h
diff --git a/ash/common/system/tray/system_tray.h b/ash/common/system/tray/system_tray.h
index 6d08cebec4d38cdbad35fa905e98a9b83593320d..dcd9339a1fe1e8b1d37815173f731c5261bbdc38 100644
--- a/ash/common/system/tray/system_tray.h
+++ b/ash/common/system/tray/system_tray.h
@@ -31,6 +31,7 @@ class TrayDate;
class TrayUpdate;
class TrayUser;
class WebNotificationTray;
+class WmShelfObserver;
// There are different methods for creating bubble views.
enum BubbleCreationType {
@@ -41,7 +42,7 @@ enum BubbleCreationType {
class ASH_EXPORT SystemTray : public TrayBackgroundView,
public views::TrayBubbleView::Delegate {
public:
- explicit SystemTray(WmShelf* wm_shelf);
+ explicit SystemTray(WmShelf* wm_shelf, WmShelfObserver* wm_shelf_observer);
James Cook 2016/08/09 00:25:17 no explicit
yiyix 2016/08/11 01:23:19 Done.
~SystemTray() override;
// Calls TrayBackgroundView::Initialize(), creates the tray items, and
@@ -217,6 +218,10 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
const ScopedVector<SystemTrayItem>& items() const { return items_; }
+ // Sets an empty border around the system tray to change user-visible size
+ // of the dark background. Doesn't do anything in MD.
James Cook 2016/08/09 00:25:17 nice documentation, esp. noting the MD vs non-MD s
yiyix 2016/08/11 01:23:19 Thank you :D
+ void AdjustStatusTrayBackground();
+
// Overridden from ActionableView.
bool PerformAction(const ui::Event& event) override;

Powered by Google App Engine
This is Rietveld 408576698