| 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 e56d0c522c94303ae0945e7409d5ace8da88dcc5..eb1d956268acd948be647599530b35db2a11adc7 100644
|
| --- a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
|
| +++ b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
|
| @@ -20,12 +20,7 @@
|
| #include "grit/browser_resources.h"
|
|
|
| #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;
|
| @@ -52,19 +47,13 @@ void LoadGaiaAuthExtension(BrowserContext* context) {
|
| return;
|
| }
|
|
|
| -#if defined(OS_CHROMEOS)
|
| int manifest_resource_id = IDR_GAIA_AUTH_MANIFEST;
|
| +
|
| +#if defined(OS_CHROMEOS)
|
| if (chromeos::system::InputDeviceSettings::Get()
|
| ->ForceKeyboardDrivenUINavigation()) {
|
| manifest_resource_id = IDR_GAIA_AUTH_KEYBOARD_MANIFEST;
|
| - } else if (!command_line->HasSwitch(chromeos::switches::kDisableSamlSignin) ||
|
| - (switches::IsNewProfileManagement() &&
|
| - context->GetPath() !=
|
| - chromeos::ProfileHelper::GetSigninProfileDir())) {
|
| - manifest_resource_id = IDR_GAIA_AUTH_SAML_MANIFEST;
|
| }
|
| -#else
|
| - int manifest_resource_id = IDR_GAIA_AUTH_SAML_MANIFEST;
|
| #endif
|
|
|
| component_loader->Add(manifest_resource_id,
|
|
|