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

Unified Diff: chrome/browser/chromeos/login/existing_user_controller.h

Issue 23494053: Remove NOTIFICATION_SYSTEM_SETTING_CHANGED, switch CrosSettings to base::CallbackRegistry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: trailing space Created 7 years, 3 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/chromeos/login/existing_user_controller.h
diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h
index dde8e6e11764a1c52af782325b55ab993c5d44d2..80fbcd5545223898d8f8fa9f9ad49f2d67f175ba 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.h
+++ b/chrome/browser/chromeos/login/existing_user_controller.h
@@ -21,6 +21,7 @@
#include "chrome/browser/chromeos/login/login_performer.h"
#include "chrome/browser/chromeos/login/login_utils.h"
#include "chrome/browser/chromeos/login/user.h"
+#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
@@ -147,6 +148,9 @@ class ExistingUserController : public LoginDisplay::Delegate,
// LoginUtils::Delegate implementation:
virtual void OnProfilePrepared(Profile* profile) OVERRIDE;
+ // Called when device settings change.
+ void DeviceSettingsChanged();
+
// Starts WizardController with the specified screen.
void ActivateWizard(const std::string& screen_name);
@@ -298,6 +302,15 @@ class ExistingUserController : public LoginDisplay::Delegate,
scoped_ptr<login::NetworkStateHelper> network_state_helper_;
+ scoped_ptr<CrosSettings::ObserverSubscription> show_user_names_subscription_;
+ scoped_ptr<CrosSettings::ObserverSubscription> allow_new_user_subscription_;
+ scoped_ptr<CrosSettings::ObserverSubscription> allow_guest_subscription_;
+ scoped_ptr<CrosSettings::ObserverSubscription> users_subscription_;
+ scoped_ptr<CrosSettings::ObserverSubscription>
+ local_account_auto_login_id_subscription_;
+ scoped_ptr<CrosSettings::ObserverSubscription>
+ local_account_auto_login_delay_subscription_;
+
FRIEND_TEST_ALL_PREFIXES(ExistingUserControllerTest, ExistingUserLogin);
DISALLOW_COPY_AND_ASSIGN(ExistingUserController);

Powered by Google App Engine
This is Rietveld 408576698