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

Unified Diff: ash/common/system/chromeos/screen_security/screen_tray_item.h

Issue 2465403002: Some more fixes to cros system tray icons (esp. screen tray items) (Closed)
Patch Set: commentary Created 4 years, 1 month 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/chromeos/screen_security/screen_tray_item.h
diff --git a/ash/common/system/chromeos/screen_security/screen_tray_item.h b/ash/common/system/chromeos/screen_security/screen_tray_item.h
index 7f2908f552396de17185cdabe972994df04d8c5a..eb93bd253ef85711e4208510bd0dcf1d17ca376c 100644
--- a/ash/common/system/chromeos/screen_security/screen_tray_item.h
+++ b/ash/common/system/chromeos/screen_security/screen_tray_item.h
@@ -93,9 +93,6 @@ class ASH_EXPORT ScreenTrayItem : public SystemTrayItem {
~ScreenTrayItem() override;
tray::ScreenTrayView* tray_view() { return tray_view_; }
- void set_tray_view(tray::ScreenTrayView* tray_view) {
- tray_view_ = tray_view;
- }
tray::ScreenStatusView* default_view() { return default_view_; }
void set_default_view(tray::ScreenStatusView* default_view) {
@@ -122,11 +119,10 @@ class ASH_EXPORT ScreenTrayItem : public SystemTrayItem {
virtual void RecordStoppedFromNotificationViewMetric() = 0;
// Overridden from SystemTrayItem.
- views::View* CreateTrayView(LoginStatus status) override = 0;
+ views::View* CreateTrayView(LoginStatus status) override;
views::View* CreateDefaultView(LoginStatus status) override = 0;
void DestroyTrayView() override;
void DestroyDefaultView() override;
- void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
private:
tray::ScreenTrayView* tray_view_;

Powered by Google App Engine
This is Rietveld 408576698