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

Unified Diff: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

Issue 134333002: Disable additional GAIA UI features (right panel) when performing sign in from multi-profiles sessi… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
index 121f31d0bd8e180dfa40e239ac76eed58157e884..e13edfe86dd370ce7e6262ba0edcab15589eff01 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -7,6 +7,7 @@
#include "base/logging.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/login/user_adding_screen.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
@@ -67,6 +68,14 @@ void UpdateAuthParams(base::DictionaryValue* params, bool has_users) {
params->SetString("managedUsersRestrictionReason",
l10n_util::GetStringUTF16(message_id));
}
+
+ // Now check whether we're in multi-profiles user adding scenario and
+ // disable GAIA right panel features if that's the case.
+ if (UserAddingScreen::Get()->IsRunning()) {
+ params->SetBoolean("createAccount", false);
+ params->SetBoolean("guestSignin", false);
+ params->SetBoolean("managedUsersEnabled", false);
+ }
}
} // namespace
@@ -195,7 +204,7 @@ void GaiaScreenHandler::HandleFrameLoadingCompleted(int status) {
}
frame_error_ = frame_error;
if (frame_error == net::OK) {
- LOG(INFO) << "Gaia is loaded";
+ VLOG(1) << "Gaia is loaded";
frame_state_ = FRAME_STATE_LOADED;
} else {
LOG(WARNING) << "Gaia frame error: " << frame_error_;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698