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

Unified Diff: chrome/browser/ui/webui/signin/user_manager_screen_handler.h

Issue 564453003: Access to Chrome via the System Tray should go through the User Manager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Estade comments Created 6 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/ui/webui/signin/user_manager_screen_handler.h
diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.h b/chrome/browser/ui/webui/signin/user_manager_screen_handler.h
index 1e7d1b625537c8d860b8a6111981b36ba935b3de..fab7f7884011928b40d3062d4f823c0b26a18333 100644
--- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.h
+++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.h
@@ -11,6 +11,7 @@
#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_metrics.h"
#include "chrome/browser/signin/screenlock_bridge.h"
#include "chrome/browser/ui/host_desktop.h"
@@ -77,6 +78,10 @@ class UserManagerScreenHandler : public content::WebUIMessageHandler,
void ReportAuthenticationResult(bool success,
ProfileMetrics::ProfileAuth metric);
+ // Perform cleanup once the profile and browser are open.
+ void OnSwitchToProfileComplete(Profile* profile,
+ Profile::CreateStatus profile_create_status);
+
// Observes the ProfileInfoCache and gets notified when a profile has been
// modified, so that the displayed user pods can be updated.
scoped_ptr<ProfileUpdateObserver> profileInfoCacheObserver_;
@@ -93,6 +98,9 @@ class UserManagerScreenHandler : public content::WebUIMessageHandler,
// Login password, held during on-line auth for saving later if correct.
std::string password_attempt_;
+ // URL hash, used to key post-profile actions if present.
+ base::string16 url_hash_;
+
typedef std::map<std::string, ScreenlockBridge::LockHandler::AuthType>
UserAuthTypeMap;
UserAuthTypeMap user_auth_type_map_;

Powered by Google App Engine
This is Rietveld 408576698