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

Unified Diff: chrome/browser/ui/ash/palette_delegate_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/palette_delegate_chromeos.h
diff --git a/chrome/browser/ui/ash/palette_delegate_chromeos.h b/chrome/browser/ui/ash/palette_delegate_chromeos.h
index 07bed63f77cf8e47555bba67812d126abf68cca8..6d358deef13e2ff34c2c3d2fa0541ce8135d91cb 100644
--- a/chrome/browser/ui/ash/palette_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/palette_delegate_chromeos.h
@@ -8,27 +8,24 @@
#include <string>
#include "ash/common/palette_delegate.h"
-#include "ash/common/session/session_state_observer.h"
#include "base/callback_list.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
+#include "components/user_manager/user_manager.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
class PrefChangeRegistrar;
class Profile;
-namespace ash {
-class ScopedSessionStateObserver;
-}
-
namespace chromeos {
// A class which allows the Ash palette to perform chrome actions.
-class PaletteDelegateChromeOS : public ash::PaletteDelegate,
- public ash::SessionStateObserver,
- public content::NotificationObserver {
+class PaletteDelegateChromeOS
+ : public ash::PaletteDelegate,
+ public user_manager::UserManager::UserSessionStateObserver,
+ public content::NotificationObserver {
public:
PaletteDelegateChromeOS();
~PaletteDelegateChromeOS() override;
@@ -45,8 +42,8 @@ class PaletteDelegateChromeOS : public ash::PaletteDelegate,
void TakePartialScreenshot(const base::Closure& done) override;
void CancelPartialScreenshot() override;
- // ash::SessionStateObserver:
- void ActiveUserChanged(const AccountId& account_id) override;
+ // user_manager::UserManager::UserSessionStateObserver:
+ void ActiveUserChanged(const user_manager::User* active_user) override;
// content::NotificationObserver:
void Observe(int type,
@@ -64,7 +61,8 @@ class PaletteDelegateChromeOS : public ash::PaletteDelegate,
// Unowned pointer to the active profile.
Profile* profile_ = nullptr;
std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;
- std::unique_ptr<ash::ScopedSessionStateObserver> session_state_observer_;
+ std::unique_ptr<user_manager::ScopedUserSessionStateObserver>
+ session_state_observer_;
content::NotificationRegistrar registrar_;
base::WeakPtrFactory<PaletteDelegateChromeOS> weak_factory_;

Powered by Google App Engine
This is Rietveld 408576698