Chromium Code Reviews| Index: chrome/browser/chromeos/login/login_utils.cc |
| diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc |
| index 8c4f23010d3249b5d018046fef3e15f8d8d7a67a..e046ef6e63f483144307a10d6a0ccb99d2d061a2 100644 |
| --- a/chrome/browser/chromeos/login/login_utils.cc |
| +++ b/chrome/browser/chromeos/login/login_utils.cc |
| @@ -90,6 +90,11 @@ |
| #include "net/url_request/url_request_context_getter.h" |
| #include "url/gurl.h" |
| +#if defined(USE_ATHENA) |
| +#include "athena/extensions/public/extensions_delegate.h" |
| +#include "athena/main/athena_launcher.h" |
| +#endif |
| + |
| using content::BrowserThread; |
| namespace { |
| @@ -289,6 +294,16 @@ void LoginUtilsImpl::DoBrowserLaunchInternal(Profile* profile, |
| chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ? |
| chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN; |
| +#if defined(USE_ATHENA) |
| + { |
| + // Athena virtual keyboard initialization require file IO. |
| + base::ThreadRestrictions::ScopedAllowIO allow_io; |
|
oshima
2014/09/04 16:14:28
I think we need to move VK initialization to env.
bshe
2014/09/04 18:36:52
VK is currently initialized in ash (see https://co
Dmitry Polukhin
2014/09/05 15:05:00
It seems that ash doing something different becaus
bshe
2014/09/05 15:15:42
VK for athena is totally different as athena doesn
sadrul
2014/09/06 02:58:12
For athena_main, the keyboard is initialized befor
|
| + |
| + athena::ExtensionsDelegate::CreateExtensionsDelegateForChrome(profile); |
| + athena::StartAthenaSessionWithContext(profile); |
| + } |
| +#endif |
| + |
| browser_creator.LaunchBrowser(*CommandLine::ForCurrentProcess(), |
| profile, |
| base::FilePath(), |