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

Unified Diff: ash/common/system/tray/system_tray_controller.cc

Issue 2568413002: Revert of ash: Use system tray mojo interface to show system update tray icon (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « ash/common/system/tray/system_tray_controller.h ('k') | ash/common/system/tray/system_tray_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/system_tray_controller.cc
diff --git a/ash/common/system/tray/system_tray_controller.cc b/ash/common/system/tray/system_tray_controller.cc
index e4e8db7a03cc3969fcd39cb35f52332df9297ae4..659cd531d79de85487ef187c8ceb0328dc34f3dd 100644
--- a/ash/common/system/tray/system_tray_controller.cc
+++ b/ash/common/system/tray/system_tray_controller.cc
@@ -4,12 +4,8 @@
#include "ash/common/system/tray/system_tray_controller.h"
-#include "ash/common/system/tray/system_tray.h"
#include "ash/common/system/tray/system_tray_notifier.h"
-#include "ash/common/system/update/tray_update.h"
-#include "ash/common/wm_root_window_controller.h"
#include "ash/common/wm_shell.h"
-#include "ash/common/wm_window.h"
namespace ash {
@@ -132,16 +128,4 @@
WmShell::Get()->system_tray_notifier()->NotifyDateFormatChanged();
}
-void SystemTrayController::ShowUpdateIcon(mojom::UpdateSeverity severity,
- bool factory_reset_required) {
- // Show the icon on all displays.
- for (WmWindow* root : WmShell::Get()->GetAllRootWindows()) {
- ash::SystemTray* tray = root->GetRootWindowController()->GetSystemTray();
- // External monitors might not have a tray yet.
- if (!tray)
- continue;
- tray->tray_update()->ShowUpdateIcon(severity, factory_reset_required);
- }
-}
-
} // namespace ash
« no previous file with comments | « ash/common/system/tray/system_tray_controller.h ('k') | ash/common/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698