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 6624053171baa6aa701f3839e55a9883bf3e7043..d715b27ad2dee436c0c0c2fd39fb35824d73cbc6 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/public/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 { |
@@ -28,9 +30,15 @@ class ChromeBrowserMainExtraPartsAthena : public ChromeBrowserMainExtraParts { |
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)) { |
+ 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(); } |