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

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

Issue 645003002: Added keyboard shortcut on GAIA "Add User" screen to dogfood GAIA /EmbeddedSignin (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. Created 6 years, 2 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_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/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 virtual ~GaiaScreenHandler(); 68 virtual ~GaiaScreenHandler();
69 69
70 void LoadGaia(const GaiaContext& context); 70 void LoadGaia(const GaiaContext& context);
71 void UpdateGaia(const GaiaContext& context); 71 void UpdateGaia(const GaiaContext& context);
72 72
73 // Sends request to reload Gaia. If |force_reload| is true, request 73 // Sends request to reload Gaia. If |force_reload| is true, request
74 // will be sent in any case, otherwise it will be sent only when Gaia is 74 // will be sent in any case, otherwise it will be sent only when Gaia is
75 // not loading right now. 75 // not loading right now.
76 void ReloadGaia(bool force_reload); 76 void ReloadGaia(bool force_reload);
77 77
78 // Reload gaia with embedded signin frame.
79 void SwitchToEmbeddedSignin();
80 // Cancel embedded signin for the next load.
ygorshenin1 2014/10/10 13:25:04 nit: a blank line before comment.
Roman Sorokin (ftl) 2014/10/10 13:51:03 Done.
81 void CancelEmbeddedSignin();
82
78 FrameState frame_state() const { return frame_state_; } 83 FrameState frame_state() const { return frame_state_; }
79 net::Error frame_error() const { return frame_error_; } 84 net::Error frame_error() const { return frame_error_; }
80 85
81 private: 86 private:
82 // TODO (ygorshenin@): remove this dependency. 87 // TODO (ygorshenin@): remove this dependency.
83 friend class SigninScreenHandler; 88 friend class SigninScreenHandler;
84 89
85 // BaseScreenHandler implementation: 90 // BaseScreenHandler implementation:
86 virtual void DeclareLocalizedValues(LocalizedValuesBuilder* builder) override; 91 virtual void DeclareLocalizedValues(LocalizedValuesBuilder* builder) override;
87 virtual void Initialize() override; 92 virtual void Initialize() override;
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 bool using_saml_api_; 212 bool using_saml_api_;
208 213
209 // Whether consumer management enrollment is in progress. 214 // Whether consumer management enrollment is in progress.
210 bool is_enrolling_consumer_management_; 215 bool is_enrolling_consumer_management_;
211 216
212 // Test credentials. 217 // Test credentials.
213 std::string test_user_; 218 std::string test_user_;
214 std::string test_pass_; 219 std::string test_pass_;
215 bool test_expects_complete_login_; 220 bool test_expects_complete_login_;
216 221
222 // True if user pressed shortcut to enable embedded signin.
223 bool embedded_signin_enabled_by_shortcut_;
224
217 // Non-owning ptr to SigninScreenHandler instance. Should not be used 225 // Non-owning ptr to SigninScreenHandler instance. Should not be used
218 // in dtor. 226 // in dtor.
219 // TODO (ygorshenin@): GaiaScreenHandler shouldn't communicate with 227 // TODO (ygorshenin@): GaiaScreenHandler shouldn't communicate with
220 // signin_screen_handler directly. 228 // signin_screen_handler directly.
221 SigninScreenHandler* signin_screen_handler_; 229 SigninScreenHandler* signin_screen_handler_;
222 230
223 base::WeakPtrFactory<GaiaScreenHandler> weak_factory_; 231 base::WeakPtrFactory<GaiaScreenHandler> weak_factory_;
224 232
225 DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler); 233 DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler);
226 }; 234 };
227 235
228 } // namespace chromeos 236 } // namespace chromeos
229 237
230 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_ 238 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698