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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/test/status_area_widget_test_helper.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
« ash/content/display/screen_orientation_controller_chromeos_unittest.cc ('K') | « ash/test/ash_test_base.cc ('k') | ash/test/tray_cast_test_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/status_area_widget_test_helper.cc
diff --git a/ash/test/status_area_widget_test_helper.cc b/ash/test/status_area_widget_test_helper.cc
index 6fcf599f85397c0707e64885c066f567895df9a8..82837c673ba70fd5d0451c5fdb218a2f6cdae92f 100644
--- a/ash/test/status_area_widget_test_helper.cc
+++ b/ash/test/status_area_widget_test_helper.cc
@@ -5,6 +5,7 @@
#include "ash/test/status_area_widget_test_helper.h"
#include "ash/common/system/tray/system_tray_delegate.h"
+#include "ash/common/wm_shell.h"
#include "ash/root_window_controller.h"
#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
@@ -13,7 +14,7 @@
namespace ash {
LoginStatus StatusAreaWidgetTestHelper::GetUserLoginStatus() {
- return Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus();
+ return WmShell::Get()->system_tray_delegate()->GetUserLoginStatus();
}
StatusAreaWidget* StatusAreaWidgetTestHelper::GetStatusAreaWidget() {
« ash/content/display/screen_orientation_controller_chromeos_unittest.cc ('K') | « ash/test/ash_test_base.cc ('k') | ash/test/tray_cast_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698