Index: chrome/browser/extensions/signin/gaia_auth_extension_loader.cc |
diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc |
index fdb59c287000e875d65f092fb5809519032a9984..e56d0c522c94303ae0945e7409d5ace8da88dcc5 100644 |
--- a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc |
+++ b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc |
@@ -21,9 +21,11 @@ |
#if defined(OS_CHROMEOS) |
#include "base/file_util.h" |
+#include "chrome/browser/chromeos/profiles/profile_helper.h" |
#include "chrome/browser/chromeos/system/input_device_settings.h" |
#include "chromeos/chromeos_constants.h" |
#include "chromeos/chromeos_switches.h" |
+#include "components/signin/core/common/profile_management_switches.h" |
#endif |
using content::BrowserContext; |
@@ -55,7 +57,10 @@ void LoadGaiaAuthExtension(BrowserContext* context) { |
if (chromeos::system::InputDeviceSettings::Get() |
->ForceKeyboardDrivenUINavigation()) { |
manifest_resource_id = IDR_GAIA_AUTH_KEYBOARD_MANIFEST; |
- } else if (!command_line->HasSwitch(chromeos::switches::kDisableSamlSignin)) { |
+ } else if (!command_line->HasSwitch(chromeos::switches::kDisableSamlSignin) || |
+ (switches::IsNewProfileManagement() && |
+ context->GetPath() != |
+ chromeos::ProfileHelper::GetSigninProfileDir())) { |
manifest_resource_id = IDR_GAIA_AUTH_SAML_MANIFEST; |
} |
#else |