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

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

Issue 1058433002: [cros login, new GAIA] New UI for not authorized error (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 8 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 // Sends request to reload Gaia. If |force_reload| is true, request 79 // Sends request to reload Gaia. If |force_reload| is true, request
80 // will be sent in any case, otherwise it will be sent only when Gaia is 80 // will be sent in any case, otherwise it will be sent only when Gaia is
81 // not loading right now. 81 // not loading right now.
82 void ReloadGaia(bool force_reload); 82 void ReloadGaia(bool force_reload);
83 83
84 // Decides whether an auth extension should be pre-loaded. If it should, 84 // Decides whether an auth extension should be pre-loaded. If it should,
85 // pre-loads it. 85 // pre-loads it.
86 void MaybePreloadAuthExtension(); 86 void MaybePreloadAuthExtension();
87 87
88 // Show error UI at the end of GAIA flow when user is not whitelisted.
89 void ShowWhitelistCheckFailedError();
90
88 FrameState frame_state() const { return frame_state_; } 91 FrameState frame_state() const { return frame_state_; }
89 net::Error frame_error() const { return frame_error_; } 92 net::Error frame_error() const { return frame_error_; }
90 93
91 private: 94 private:
92 // TODO (antrim@): remove this dependency. 95 // TODO (antrim@): remove this dependency.
93 friend class SigninScreenHandler; 96 friend class SigninScreenHandler;
94 97
95 // BaseScreenHandler implementation: 98 // BaseScreenHandler implementation:
96 void DeclareLocalizedValues( 99 void DeclareLocalizedValues(
97 ::login::LocalizedValuesBuilder* builder) override; 100 ::login::LocalizedValuesBuilder* builder) override;
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 scoped_ptr<ScopedGaiaAuthExtension> auth_extension_; 262 scoped_ptr<ScopedGaiaAuthExtension> auth_extension_;
260 263
261 base::WeakPtrFactory<GaiaScreenHandler> weak_factory_; 264 base::WeakPtrFactory<GaiaScreenHandler> weak_factory_;
262 265
263 DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler); 266 DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler);
264 }; 267 };
265 268
266 } // namespace chromeos 269 } // namespace chromeos
267 270
268 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_ 271 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698