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

Unified Diff: chrome/browser/ui/views/frame/browser_frame.cc

Issue 2661283002: cros: Clean up SessionStateDelegate refs in Chrome (Closed)
Patch Set: update browser_finder_chromeos_unittest Created 3 years, 10 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: chrome/browser/ui/views/frame/browser_frame.cc
diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc
index 643b7391e15b2f4c4c46267316d1ac8df0b09231..c78624a5119ad58a967219a3026743531669a416 100644
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -33,8 +33,7 @@
#include "ui/views/widget/native_widget.h"
#if defined(OS_CHROMEOS)
-#include "ash/common/session/session_state_delegate.h" // nogncheck
-#include "ash/common/wm_shell.h" // nogncheck
+#include "components/user_manager/user_manager.h"
#endif
#if defined(OS_LINUX)
@@ -257,9 +256,8 @@ void BrowserFrame::ShowContextMenuForView(views::View* source,
ui::MenuModel* BrowserFrame::GetSystemMenuModel() {
#if defined(OS_CHROMEOS)
- ash::SessionStateDelegate* delegate =
- ash::WmShell::Get()->GetSessionStateDelegate();
- if (delegate && delegate->NumberOfLoggedInUsers() > 1) {
+ if (user_manager::UserManager::IsInitialized() &&
+ user_manager::UserManager::Get()->GetLoggedInUsers().size() > 1) {
// In Multi user mode, the number of users as well as the order of users
// can change. Coming here we have more than one user and since the menu
// model contains the user information, it must get updated to show any
« no previous file with comments | « chrome/browser/ui/browser_finder_chromeos_unittest.cc ('k') | chrome/browser/ui/views/frame/system_menu_model_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698