Commit 3e74a3c5 authored by Manu Cornet's avatar Manu Cornet Committed by Commit Bot

CrOS systray: Don't include |login_status| as param in callbacks

It is unused and retrieving the login status from the session controller
is easy enough anyway.

Bug: 1042918, 1047012
Change-Id: I06afc5a4f724a45814e76b3bd7af79eab42489a6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2070815Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Manu Cornet <manucornet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744101}
parent f4e8f161
...@@ -61,7 +61,7 @@ OverviewButtonTray::~OverviewButtonTray() { ...@@ -61,7 +61,7 @@ OverviewButtonTray::~OverviewButtonTray() {
Shell::Get()->shelf_config()->RemoveObserver(this); Shell::Get()->shelf_config()->RemoveObserver(this);
} }
void OverviewButtonTray::UpdateAfterLoginStatusChange(LoginStatus status) { void OverviewButtonTray::UpdateAfterLoginStatusChange() {
UpdateIconVisibility(); UpdateIconVisibility();
} }
......
...@@ -68,7 +68,7 @@ class ASH_EXPORT OverviewButtonTray : public TrayBackgroundView, ...@@ -68,7 +68,7 @@ class ASH_EXPORT OverviewButtonTray : public TrayBackgroundView,
void OnShelfConfigUpdated() override; void OnShelfConfigUpdated() override;
// TrayBackgroundView: // TrayBackgroundView:
void UpdateAfterLoginStatusChange(LoginStatus status) override; void UpdateAfterLoginStatusChange() override;
void ClickedOutsideBubble() override; void ClickedOutsideBubble() override;
base::string16 GetAccessibleNameForTray() override; base::string16 GetAccessibleNameForTray() override;
void HideBubbleWithView(const TrayBubbleView* bubble_view) override; void HideBubbleWithView(const TrayBubbleView* bubble_view) override;
......
...@@ -117,7 +117,7 @@ void LogoutButtonTray::UpdateLogoutDialogDuration() { ...@@ -117,7 +117,7 @@ void LogoutButtonTray::UpdateLogoutDialogDuration() {
dialog_duration_ = base::TimeDelta::FromMilliseconds(duration_ms); dialog_duration_ = base::TimeDelta::FromMilliseconds(duration_ms);
} }
void LogoutButtonTray::UpdateAfterLoginStatusChange(LoginStatus status) { void LogoutButtonTray::UpdateAfterLoginStatusChange() {
UpdateButtonTextAndImage(); UpdateButtonTextAndImage();
} }
......
...@@ -36,7 +36,7 @@ class ASH_EXPORT LogoutButtonTray : public TrayBackgroundView, ...@@ -36,7 +36,7 @@ class ASH_EXPORT LogoutButtonTray : public TrayBackgroundView,
static void RegisterProfilePrefs(PrefRegistrySimple* registry); static void RegisterProfilePrefs(PrefRegistrySimple* registry);
// TrayBackgroundView: // TrayBackgroundView:
void UpdateAfterLoginStatusChange(LoginStatus status) override; void UpdateAfterLoginStatusChange() override;
void UpdateAfterShelfChange() override; void UpdateAfterShelfChange() override;
void UpdateBackground() override; void UpdateBackground() override;
void ClickedOutsideBubble() override; void ClickedOutsideBubble() override;
......
...@@ -112,7 +112,7 @@ void StatusAreaWidget::UpdateAfterLoginStatusChange(LoginStatus login_status) { ...@@ -112,7 +112,7 @@ void StatusAreaWidget::UpdateAfterLoginStatusChange(LoginStatus login_status) {
login_status_ = login_status; login_status_ = login_status;
for (TrayBackgroundView* tray_button : tray_buttons_) for (TrayBackgroundView* tray_button : tray_buttons_)
tray_button->UpdateAfterLoginStatusChange(login_status); tray_button->UpdateAfterLoginStatusChange();
} }
void StatusAreaWidget::SetSystemTrayVisibility(bool visible) { void StatusAreaWidget::SetSystemTrayVisibility(bool visible) {
......
...@@ -345,8 +345,7 @@ void TrayBackgroundView::UpdateAfterShelfChange() { ...@@ -345,8 +345,7 @@ void TrayBackgroundView::UpdateAfterShelfChange() {
tray_container_->UpdateAfterShelfChange(); tray_container_->UpdateAfterShelfChange();
} }
void TrayBackgroundView::UpdateAfterLoginStatusChange( void TrayBackgroundView::UpdateAfterLoginStatusChange() {
LoginStatus login_status) {
// Handled in subclasses. // Handled in subclasses.
} }
......
...@@ -67,7 +67,7 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, ...@@ -67,7 +67,7 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
virtual void UpdateAfterShelfChange(); virtual void UpdateAfterShelfChange();
// Called to update the tray button after the login status changes. // Called to update the tray button after the login status changes.
virtual void UpdateAfterLoginStatusChange(LoginStatus login_status); virtual void UpdateAfterLoginStatusChange();
// Called whenever the bounds of the root window changes. // Called whenever the bounds of the root window changes.
virtual void UpdateAfterRootWindowBoundsChange(const gfx::Rect& old_bounds, virtual void UpdateAfterRootWindowBoundsChange(const gfx::Rect& old_bounds,
......
...@@ -298,7 +298,7 @@ gfx::Rect UnifiedSystemTray::GetBubbleBoundsInScreen() const { ...@@ -298,7 +298,7 @@ gfx::Rect UnifiedSystemTray::GetBubbleBoundsInScreen() const {
return bubble_ ? bubble_->GetBoundsInScreen() : gfx::Rect(); return bubble_ ? bubble_->GetBoundsInScreen() : gfx::Rect();
} }
void UnifiedSystemTray::UpdateAfterLoginStatusChange(LoginStatus status) { void UnifiedSystemTray::UpdateAfterLoginStatusChange() {
SetVisiblePreferred(true); SetVisiblePreferred(true);
PreferredSizeChanged(); PreferredSizeChanged();
} }
......
...@@ -129,7 +129,7 @@ class ASH_EXPORT UnifiedSystemTray : public TrayBackgroundView, ...@@ -129,7 +129,7 @@ class ASH_EXPORT UnifiedSystemTray : public TrayBackgroundView,
void HideBubbleWithView(const TrayBubbleView* bubble_view) override; void HideBubbleWithView(const TrayBubbleView* bubble_view) override;
void ClickedOutsideBubble() override; void ClickedOutsideBubble() override;
void UpdateAfterShelfChange() override; void UpdateAfterShelfChange() override;
void UpdateAfterLoginStatusChange(LoginStatus status) override; void UpdateAfterLoginStatusChange() override;
bool ShouldEnableExtraKeyboardAccessibility() override; bool ShouldEnableExtraKeyboardAccessibility() override;
const char* GetClassName() const override; const char* GetClassName() const override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment