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

Unified Diff: ash/system/chromeos/tray_tracing.cc

Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review feedback 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/tray_tracing.cc
diff --git a/ash/system/chromeos/tray_tracing.cc b/ash/system/chromeos/tray_tracing.cc
index 4750923a243b72702e45ba84f1d7b27ef3f311af..5d125be39e5d91a34ac173cc71f871ea1481fb69 100644
--- a/ash/system/chromeos/tray_tracing.cc
+++ b/ash/system/chromeos/tray_tracing.cc
@@ -7,6 +7,7 @@
#include "ash/common/system/tray/fixed_sized_image_view.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/system/tray/tray_constants.h"
+#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/system/tray/actionable_view.h"
#include "ash/system/tray/system_tray.h"
@@ -48,7 +49,7 @@ class DefaultTracingView : public ActionableView {
private:
// Overridden from ActionableView.
bool PerformAction(const ui::Event& event) override {
- Shell::GetInstance()->system_tray_delegate()->ShowChromeSlow();
+ WmShell::Get()->system_tray_delegate()->ShowChromeSlow();
return true;
}

Powered by Google App Engine
This is Rietveld 408576698