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

Unified Diff: ash/common/system/user/tray_user_separator.cc

Issue 2099793002: mash: Migrate some system user files to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup 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/common/system/user/tray_user_separator.cc
diff --git a/ash/system/user/tray_user_separator.cc b/ash/common/system/user/tray_user_separator.cc
similarity index 90%
rename from ash/system/user/tray_user_separator.cc
rename to ash/common/system/user/tray_user_separator.cc
index 1a2d71e9fd8cb4a235ed428d7466df6baee26b41..4fc13b223f0f8351082ee3dfd9bae700e128c787 100644
--- a/ash/system/user/tray_user_separator.cc
+++ b/ash/common/system/user/tray_user_separator.cc
@@ -2,11 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/system/user/tray_user_separator.h"
+#include "ash/common/system/user/tray_user_separator.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/wm_shell.h"
-#include "ash/shell.h"
#include "ui/views/view.h"
namespace ash {
@@ -25,7 +24,7 @@ views::View* TrayUserSeparator::CreateDefaultView(LoginStatus status) {
return NULL;
const SessionStateDelegate* session_state_delegate =
- Shell::GetInstance()->session_state_delegate();
+ WmShell::Get()->GetSessionStateDelegate();
// If the screen is locked, a system modal dialog or a single user is shown,
// show nothing.

Powered by Google App Engine
This is Rietveld 408576698