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

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

Issue 7867044: PART1: Initiated the SignedSettings refactoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed the comments from Denis. Created 9 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 efb8ae94c9989c7cc3792c132dd090c637d3ece4..d5949c647abbd8614631e539cbcaed1787c2b244 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.h
+++ b/chrome/browser/chromeos/login/existing_user_controller.h
@@ -10,6 +10,7 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
#include "base/string16.h"
#include "base/task.h"
#include "base/timer.h"
@@ -30,7 +31,7 @@
namespace chromeos {
class LoginDisplayHost;
-class UserCrosSettingsProvider;
+class CrosSettings;
// ExistingUserController is used to handle login when someone has
// already logged into the machine.
@@ -176,7 +177,7 @@ class ExistingUserController : public LoginDisplay::Delegate,
static ExistingUserController* current_controller_;
// Triggers prefetching of user settings.
- scoped_ptr<UserCrosSettingsProvider> user_settings_;
+ CrosSettings* user_settings_;
// URL to append to start Guest mode with.
GURL guest_mode_url_;
@@ -185,7 +186,7 @@ class ExistingUserController : public LoginDisplay::Delegate,
NotificationRegistrar registrar_;
// Factory of callbacks.
- ScopedRunnableMethodFactory<ExistingUserController> method_factory_;
+ base::WeakPtrFactory<ExistingUserController> pointer_factory_;
// Whether everything is ready to launch the browser.
bool ready_for_browser_launch_;

Powered by Google App Engine
This is Rietveld 408576698