Implemented inline login dialog for Chrome OS.

chrome/browser/extensions/signin/gaia_auth_extension_loader.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "extensions/browser/extension_system.h"
 #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;
 using content::BrowserThread;
 
 namespace {
 
 extensions::ComponentLoader* GetComponentLoader(BrowserContext* context) {
   extensions::ExtensionSystem* extension_system =
       extensions::ExtensionSystem::Get(context);
@@ skipping 11 matching lines @@
         command_line->GetSwitchValuePath(switches::kAuthExtensionPath);
     component_loader->Add(IDR_GAIA_AUTH_MANIFEST, auth_extension_path);
     return;
   }
 
 #if defined(OS_CHROMEOS)
   int manifest_resource_id = IDR_GAIA_AUTH_MANIFEST;
   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
   int manifest_resource_id = IDR_GAIA_AUTH_SAML_MANIFEST;
 #endif
 
   component_loader->Add(manifest_resource_id,
                         base::FilePath(FILE_PATH_LITERAL("gaia_auth")));
 }
 
@@ skipping 57 matching lines @@
     BrowserContextKeyedAPIFactory<GaiaAuthExtensionLoader> > g_factory =
     LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<GaiaAuthExtensionLoader>*
 GaiaAuthExtensionLoader::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 } // namespace extensions