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 ad2b24328e8249f409e09609d6667122776d3c79..1a29bff580d27ac25ff078796c7a5e0c024dc90d 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 |
@@ -16,6 +16,7 @@ |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/common/chrome_switches.h" |
+#include "chromeos/chromeos_switches.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
@@ -47,9 +48,15 @@ class ChromeBrowserMainExtraPartsAthena : public ChromeBrowserMainExtraParts, |
} |
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)) { |
+ athena::ExtensionsDelegate::CreateExtensionsDelegateForChrome(profile); |
+ athena::StartAthenaSessionWithContext(profile); |
+ } else { |
+ // Only initialize virtual keyboard with login profile, user session will |
+ // start after login. |
+ athena::CreateVirtualKeyboardWithContext(profile); |
+ } |
} |
virtual void PostMainMessageLoopRun() OVERRIDE { athena::ShutdownAthena(); } |