| Index: trunk/src/chrome/browser/ui/ash/ash_init.cc
|
| ===================================================================
|
| --- trunk/src/chrome/browser/ui/ash/ash_init.cc (revision 251431)
|
| +++ trunk/src/chrome/browser/ui/ash/ash_init.cc (working copy)
|
| @@ -10,12 +10,14 @@
|
| #include "ash/magnifier/magnification_controller.h"
|
| #include "ash/magnifier/partial_magnification_controller.h"
|
| #include "ash/shell.h"
|
| +#include "ash/wm/event_rewriter_event_filter.h"
|
| #include "base/command_line.h"
|
| #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/lifetime/application_lifetime.h"
|
| #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
|
| +#include "chrome/browser/ui/ash/event_rewriter.h"
|
| #include "chrome/browser/ui/ash/screenshot_taker.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "ui/aura/env.h"
|
| @@ -56,6 +58,8 @@
|
|
|
| // Shell takes ownership of ChromeShellDelegate.
|
| ash::Shell* shell = ash::Shell::CreateInstance(new ChromeShellDelegate);
|
| + shell->event_rewriter_filter()->SetEventRewriterDelegate(
|
| + scoped_ptr<ash::EventRewriterDelegate>(new EventRewriter).Pass());
|
| shell->accelerator_controller()->SetScreenshotDelegate(
|
| scoped_ptr<ash::ScreenshotDelegate>(new ScreenshotTaker).Pass());
|
| #if defined(OS_CHROMEOS)
|
|
|