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

Unified Diff: ash/system/chromeos/screen_security/screen_share_tray_item.cc

Issue 2098023002: mash: Migrate remaining tray observers and notify functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. 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/chromeos/screen_security/screen_share_tray_item.cc
diff --git a/ash/system/chromeos/screen_security/screen_share_tray_item.cc b/ash/system/chromeos/screen_security/screen_share_tray_item.cc
index 2c8bd67e504fbc9c32aba1eaa9f4b5b309564523..58b798b7b940b3f8e25d3b67c9c6ab4b92b5f596 100644
--- a/ash/system/chromeos/screen_security/screen_share_tray_item.cc
+++ b/ash/system/chromeos/screen_security/screen_share_tray_item.cc
@@ -7,7 +7,8 @@
#include <utility>
#include "ash/common/system/system_notifier.h"
-#include "ash/shell.h"
+#include "ash/common/system/tray/system_tray_notifier.h"
+#include "ash/common/wm_shell.h"
#include "grit/ash_resources.h"
#include "grit/ash_strings.h"
#include "ui/base/l10n/l10n_util.h"
@@ -26,13 +27,11 @@ const char kScreenShareNotificationId[] = "chrome://screen/share";
ScreenShareTrayItem::ScreenShareTrayItem(SystemTray* system_tray)
: ScreenTrayItem(system_tray) {
- Shell::GetInstance()->system_tray_notifier()->
- AddScreenShareObserver(this);
+ WmShell::Get()->system_tray_notifier()->AddScreenShareObserver(this);
}
ScreenShareTrayItem::~ScreenShareTrayItem() {
- Shell::GetInstance()->system_tray_notifier()->
- RemoveScreenShareObserver(this);
+ WmShell::Get()->system_tray_notifier()->RemoveScreenShareObserver(this);
}
views::View* ScreenShareTrayItem::CreateTrayView(LoginStatus status) {

Powered by Google App Engine
This is Rietveld 408576698