Chromium Code Reviews| Index: chrome/browser/ui/ash/ash_init.cc |
| diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc |
| index 0ceb1aa4dc7a582ca5e223c940910e2cdac51dcd..93df7e812c572c00dd9630ad0d216723d1987c58 100644 |
| --- a/chrome/browser/ui/ash/ash_init.cc |
| +++ b/chrome/browser/ui/ash/ash_init.cc |
| @@ -6,6 +6,7 @@ |
| #include "ash/accelerators/accelerator_controller.h" |
| #include "ash/ash_switches.h" |
| +#include "ash/autoclick/autoclick_controller.h" |
| #include "ash/high_contrast/high_contrast_controller.h" |
| #include "ash/magnifier/magnification_controller.h" |
| #include "ash/magnifier/partial_magnification_controller.h" |
| @@ -19,6 +20,7 @@ |
| #include "chrome/browser/browser_shutdown.h" |
| #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
| #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
| +#include "chrome/browser/chromeos/ui/autoclick_ring_handler.h" |
| #include "chrome/browser/lifetime/application_lifetime.h" |
| #include "chrome/browser/ui/ash/chrome_screenshot_grabber.h" |
| #include "chrome/browser/ui/ash/chrome_shell_content_state.h" |
| @@ -70,6 +72,9 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) { |
| ash::Shell* shell = ash::Shell::CreateInstance(shell_init_params); |
| shell->accelerator_controller()->SetScreenshotDelegate( |
| std::unique_ptr<ash::ScreenshotDelegate>(new ChromeScreenshotGrabber)); |
| + shell->autoclick_controller()->SetDelegate( |
| + std::unique_ptr<ash::AutoclickController::Delegate>( |
|
jdufault
2016/06/08 17:50:20
Can you use base::WrapUnique?
sammiequon
2016/06/09 04:03:46
Done.
|
| + new chromeos::AutoclickRingHandler)); |
| // TODO(flackr): Investigate exposing a blocking pool task runner to chromeos. |
| chromeos::AccelerometerReader::GetInstance()->Initialize( |
| content::BrowserThread::GetBlockingPool() |