Regression: Search+Key pops up app launcher

ui/wm/core/accelerator_filter.h

Index: ui/wm/core/accelerator_filter.h
diff --git a/ui/wm/core/accelerator_filter.h b/ui/wm/core/accelerator_filter.h
index 44579efa04348c9683404de9ff779ca9e200e53d..79317e11eb1d2cb775d6e7586515026d0690f1ac 100644
--- a/ui/wm/core/accelerator_filter.h
+++ b/ui/wm/core/accelerator_filter.h
@@ -12,6 +12,7 @@
 
 namespace ui {
 class Accelerator;
+class AcceleratorHistory;
 }
 
 namespace wm {
@@ -21,7 +22,10 @@ class AcceleratorDelegate;
 // keyboard accelerators.
 class WM_EXPORT AcceleratorFilter : public ui::EventHandler {
  public:
-  AcceleratorFilter(scoped_ptr<AcceleratorDelegate> delegate);
+  // AcceleratorFilter doesn't own |accelerator_history|, it's owned by
+  // AcceleratorController.
+  AcceleratorFilter(scoped_ptr<AcceleratorDelegate> delegate,
+                    ui::AcceleratorHistory* accelerator_history);
   ~AcceleratorFilter() override;
 
   // Overridden from ui::EventHandler:
@@ -29,6 +33,7 @@ class WM_EXPORT AcceleratorFilter : public ui::EventHandler {
 
  private:
   scoped_ptr<AcceleratorDelegate> delegate_;
+  ui::AcceleratorHistory* accelerator_history_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorFilter);
 };