| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| index adf3739298038f267d447494a72a011875deaea8..c3ed4069f229769354c2ddc3bd73c6448999b3f5 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -428,17 +428,6 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
|
| imageburner::BurnManager::Initialize(
|
| downloads_directory, g_browser_process->system_request_context());
|
|
|
| -#if defined(USE_X11)
|
| - // Listen for system key events so that the user will be able to adjust the
|
| - // volume on the login screen, if Chrome is running on Chrome OS
|
| - // (i.e. not Linux desktop), and in non-test mode.
|
| - // Note: SystemKeyEventListener depends on the DBus thread.
|
| - if (base::SysInfo::IsRunningOnChromeOS() &&
|
| - !parameters().ui_task) { // ui_task is non-NULL when running tests.
|
| - SystemKeyEventListener::Initialize();
|
| - }
|
| -#endif
|
| -
|
| DeviceOAuth2TokenServiceFactory::Initialize();
|
|
|
| ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
|
| @@ -697,6 +686,15 @@ void ChromeBrowserMainPartsChromeos::PreBrowserStart() {
|
| g_browser_process->metrics_service()->StartExternalMetrics();
|
|
|
| #if defined(USE_X11)
|
| + // Listen for system key events so that the user will be able to adjust the
|
| + // volume on the login screen, if Chrome is running on Chrome OS
|
| + // (i.e. not Linux desktop), and in non-test mode.
|
| + // Note: SystemKeyEventListener depends on the DBus thread.
|
| + if (base::SysInfo::IsRunningOnChromeOS() &&
|
| + !parameters().ui_task) { // ui_task is non-NULL when running tests.
|
| + SystemKeyEventListener::Initialize();
|
| + }
|
| +
|
| // Listen for XI_HierarchyChanged events. Note: if this is moved to
|
| // PreMainMessageLoopRun() then desktopui_PageCyclerTests fail for unknown
|
| // reasons, see http://crosbug.com/24833.
|
|
|