Minimal support for OOBE/login for chrome-athena

chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc

Index: chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc
diff --git a/chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc b/chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc
index 37735735dee17cb3d63d4d095cfb47c2fe5e78e8..0566cc5edc15678999cb07b2671acea298f61440 100644
--- a/chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc
+++ b/chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc
@@ -6,11 +6,13 @@
 
 #include "athena/extensions/public/extensions_delegate.h"
 #include "athena/main/athena_launcher.h"
+#include "base/command_line.h"
 #include "base/macros.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chromeos/chromeos_switches.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace {
@@ -26,11 +28,14 @@ class ChromeBrowserMainExtraPartsAthena : public ChromeBrowserMainExtraParts {
         content::BrowserThread::FILE));
   }
   virtual void PostProfileInit() OVERRIDE {
-    Profile* profile =
-        g_browser_process->profile_manager()->GetActiveUserProfile();
-    // TODO(oshima|polukhin): Start OOBE/Login process.
-    athena::ExtensionsDelegate::CreateExtensionsDelegateForChrome(profile);
-    athena::StartAthenaSessionWithContext(profile);
+    if (!CommandLine::ForCurrentProcess()->HasSwitch(
+            chromeos::switches::kLoginManager)) {
+      Profile* profile =
+          g_browser_process->profile_manager()->GetActiveUserProfile();
+      // TODO(oshiam|polukhin): Start OOBE/Login process.
+      athena::ExtensionsDelegate::CreateExtensionsDelegateForChrome(profile);
+      athena::StartAthenaSessionWithContext(profile);
+    }
   }
   virtual void PostMainMessageLoopRun() OVERRIDE { athena::ShutdownAthena(); }