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

Side by Side Diff: chrome/browser/ui/webui/signin/user_manager_screen_handler.h

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_USER_MANAGER_SCREEN_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_USER_MANAGER_SCREEN_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_SIGNIN_USER_MANAGER_SCREEN_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_SIGNIN_USER_MANAGER_SCREEN_HANDLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 99
100 // Perform cleanup once the profile and browser are open. 100 // Perform cleanup once the profile and browser are open.
101 void OnSwitchToProfileComplete(Profile* profile, 101 void OnSwitchToProfileComplete(Profile* profile,
102 Profile::CreateStatus profile_create_status); 102 Profile::CreateStatus profile_create_status);
103 103
104 // Observes the ProfileInfoCache and gets notified when a profile has been 104 // Observes the ProfileInfoCache and gets notified when a profile has been
105 // modified, so that the displayed user pods can be updated. 105 // modified, so that the displayed user pods can be updated.
106 scoped_ptr<ProfileUpdateObserver> profileInfoCacheObserver_; 106 scoped_ptr<ProfileUpdateObserver> profileInfoCacheObserver_;
107 107
108 // The host desktop type this user manager belongs to. 108 // The host desktop type this user manager belongs to.
109 chrome::HostDesktopType desktop_type_; 109 ui::HostDesktopType desktop_type_;
110 110
111 // Authenticator used when local-auth fails. 111 // Authenticator used when local-auth fails.
112 scoped_ptr<gaia::GaiaOAuthClient> oauth_client_; 112 scoped_ptr<gaia::GaiaOAuthClient> oauth_client_;
113 113
114 // The path of the profile currently being authenticated. 114 // The path of the profile currently being authenticated.
115 base::FilePath authenticating_profile_path_; 115 base::FilePath authenticating_profile_path_;
116 116
117 // Login email held during on-line auth for later use. 117 // Login email held during on-line auth for later use.
118 std::string email_address_; 118 std::string email_address_;
119 119
120 // URL hash, used to key post-profile actions if present. 120 // URL hash, used to key post-profile actions if present.
121 std::string url_hash_; 121 std::string url_hash_;
122 122
123 typedef std::map<std::string, 123 typedef std::map<std::string,
124 proximity_auth::ScreenlockBridge::LockHandler::AuthType> 124 proximity_auth::ScreenlockBridge::LockHandler::AuthType>
125 UserAuthTypeMap; 125 UserAuthTypeMap;
126 UserAuthTypeMap user_auth_type_map_; 126 UserAuthTypeMap user_auth_type_map_;
127 127
128 content::NotificationRegistrar registrar_; 128 content::NotificationRegistrar registrar_;
129 129
130 base::WeakPtrFactory<UserManagerScreenHandler> weak_ptr_factory_; 130 base::WeakPtrFactory<UserManagerScreenHandler> weak_ptr_factory_;
131 131
132 DISALLOW_COPY_AND_ASSIGN(UserManagerScreenHandler); 132 DISALLOW_COPY_AND_ASSIGN(UserManagerScreenHandler);
133 }; 133 };
134 134
135 #endif // CHROME_BROWSER_UI_WEBUI_SIGNIN_USER_MANAGER_SCREEN_HANDLER_H_ 135 #endif // CHROME_BROWSER_UI_WEBUI_SIGNIN_USER_MANAGER_SCREEN_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698