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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h

Issue 2529103002: Add account_type into AccountId (Closed)
Patch Set: Created 4 years 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_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 170
171 SigninScreenHandlerDelegate* Delegate(); 171 SigninScreenHandlerDelegate* Delegate();
172 172
173 // Returns temporary unused device Id. 173 // Returns temporary unused device Id.
174 std::string GetTemporaryDeviceId(); 174 std::string GetTemporaryDeviceId();
175 175
176 FrameState frame_state() const { return frame_state_; } 176 FrameState frame_state() const { return frame_state_; }
177 net::Error frame_error() const { return frame_error_; } 177 net::Error frame_error() const { return frame_error_; }
178 178
179 // Returns user canonical e-mail. Finds already used account alias, if 179 // Returns user canonical e-mail. Finds already used account alias, if
180 // user has already signed in. 180 // user has already signed in.
Andrew T Wilson (Slow) 2016/11/29 11:05:36 Document what account_type is.
Roman Sorokin (ftl) 2016/12/02 11:13:10 Switched to enum class
181 AccountId GetAccountId(const std::string& authenticated_email, 181 AccountId GetAccountId(const std::string& authenticated_email,
182 const std::string& gaia_id) const; 182 const std::string& gaia_id,
183 const std::string& account_type) const;
Andrew T Wilson (Slow) 2016/11/29 11:05:36 Seems like most places are just passing an empty s
Alexander Alekseev 2016/11/30 04:18:42 Yes, it will. But I believe that people should alw
183 184
184 bool offline_login_is_active() const { return offline_login_is_active_; } 185 bool offline_login_is_active() const { return offline_login_is_active_; }
185 void set_offline_login_is_active(bool offline_login_is_active) { 186 void set_offline_login_is_active(bool offline_login_is_active) {
186 offline_login_is_active_ = offline_login_is_active; 187 offline_login_is_active_ = offline_login_is_active;
187 } 188 }
188 189
189 // Current state of Gaia frame. 190 // Current state of Gaia frame.
190 FrameState frame_state_ = FRAME_STATE_UNKNOWN; 191 FrameState frame_state_ = FRAME_STATE_UNKNOWN;
191 192
192 // Latest Gaia frame error. 193 // Latest Gaia frame error.
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 bool auth_extension_being_loaded_ = false; 252 bool auth_extension_being_loaded_ = false;
252 253
253 base::WeakPtrFactory<GaiaScreenHandler> weak_factory_; 254 base::WeakPtrFactory<GaiaScreenHandler> weak_factory_;
254 255
255 DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler); 256 DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler);
256 }; 257 };
257 258
258 } // namespace chromeos 259 } // namespace chromeos
259 260
260 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_ 261 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698