Reland "Use chromeos accelerometer reader and support only lid accelerometer. (patchset #3 id:60001…

athena/main/athena_launcher.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/main/public/athena_launcher.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/public/app_registry.h"
 #include "athena/content/public/content_activity_factory_creator.h"
@@ skipping 65 matching lines @@
   }
 
  private:
   virtual void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) OVERRIDE {
     HomeCard::Get()->UpdateVirtualKeyboardBounds(new_bounds);
   }
 
   DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardObserver);
 };
 
-void StartAthenaEnv(scoped_refptr<base::TaskRunner> file_runner) {
+void StartAthenaEnv(scoped_refptr<base::TaskRunner> blocking_task_runner) {
   athena::AthenaEnv::Create();
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
   // Force showing in the experimental app-list view.
   command_line->AppendSwitch(app_list::switches::kEnableExperimentalAppList);
   command_line->AppendSwitch(switches::kEnableOverlayScrollbar);
 
 #if defined(USE_X11)
   ui::TouchFactory::SetTouchDeviceListFromCommandLine();
 #endif
 
   views::ViewsDelegate::views_delegate = new AthenaViewsDelegate();
 
   AthenaEnvState* env_state = new AthenaEnvState;
 
   // Setup VisibilityClient
   env_state->visibility_client.reset(new ::wm::VisibilityController);
   aura::Window* root_window = athena::AthenaEnv::Get()->GetHost()->window();
 
   aura::client::SetVisibilityClient(root_window,
                                     env_state->visibility_client.get());
 
   athena::InputManager::Create()->OnRootWindowCreated(root_window);
   athena::ScreenManager::Create(root_window);
-  athena::SystemUI::Create(file_runner);
+  athena::SystemUI::Create(blocking_task_runner);
   athena::WindowManager::Create();
   athena::AppRegistry::Create();
   SetupBackgroundImage();
 
   athena::ScreenManager::Get()->GetContext()->SetProperty(
       kAthenaEnvStateKey, env_state);
 }
 
 void CreateVirtualKeyboardWithContext(content::BrowserContext* context) {
   athena::VirtualKeyboardManager::Create(context);
@@ skipping 35 matching lines @@
   athena::SystemUI::Shutdown();
   athena::ScreenManager::Shutdown();
   athena::InputManager::Shutdown();
   athena::ExtensionsDelegate::Shutdown();
   athena::AthenaEnv::Shutdown();
 
   delete views::ViewsDelegate::views_delegate;
 }
 
 }  // namespace athena