| 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_;
|
|
|