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

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h

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/ash/multi_user/multi_user_window_manager_chromeos.h
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h
index 17bd7cbe4cb4d6986cfce9003f38413c8b5af061..6ced23f401ad0b0e40c0619e0ece0e0c29a14c86 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h
@@ -9,12 +9,12 @@
#include <memory>
#include <string>
-#include "ash/common/session/session_state_observer.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/observer_list.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/user_manager.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "ui/aura/window_observer.h"
@@ -58,7 +58,7 @@ class UserSwitchAnimatorChromeOS;
// gets detached from its current owning parent.
class MultiUserWindowManagerChromeOS
: public MultiUserWindowManager,
- public ash::SessionStateObserver,
+ public user_manager::UserManager::UserSessionStateObserver,
public aura::WindowObserver,
public content::NotificationObserver,
public wm::TransientWindowObserver {
@@ -93,8 +93,8 @@ class MultiUserWindowManagerChromeOS
void AddObserver(Observer* observer) override;
void RemoveObserver(Observer* observer) override;
- // SessionStateObserver overrides:
- void ActiveUserChanged(const AccountId& account_id) override;
+ // user_manager::UserManager::UserSessionStateObserver overrides:
+ void ActiveUserChanged(const user_manager::User* active_user) override;
// WindowObserver overrides:
void OnWindowDestroyed(aura::Window* window) override;

Powered by Google App Engine
This is Rietveld 408576698