Keep the SystemModalContainerEventHandler added

ash/shell.h

 // Copyright (c) 2012 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 509 matching lines @@
 #endif  // defined(OS_CHROMEOS)
 
   ScreenPinningController* screen_pinning_controller() {
     return screen_pinning_controller_.get();
   }
 
   ToastManager* toast_manager() { return toast_manager_.get(); }
 
   GPUSupport* gpu_support() { return gpu_support_.get(); }
 
+  // ash::SystemModalContainerEventFilterDelegate overrides:

[oshima, 2016/07/07 22:01:17]

nit: // SystemModalContainerEventFilterDelegate:

(it's new style)

+  bool CanWindowReceiveEvents(aura::Window* window) override;
+
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
   FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
   FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
   friend class RootWindowController;
   friend class ScopedTargetRootWindow;
   friend class test::ShellTestApi;
   friend class shell::WindowWatcher;
 
   typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
 
   // Takes ownership of |delegate|.
   Shell(ShellDelegate* delegate, base::SequencedWorkerPool* blocking_pool);
   ~Shell() override;
 
   void Init(const ShellInitParams& init_params);
 
   // Initializes virtual keyboard controller.
   void InitKeyboard();
 
   // Initializes the root window so that it can host browser windows.
   void InitRootWindow(aura::Window* root_window);
 
   // Prepares the shelf to be deleted.
   void ShutdownShelf();
 
-  // ash::SystemModalContainerEventFilterDelegate overrides:
-  bool CanWindowReceiveEvents(aura::Window* window) override;
-
   // Overridden from ui::EventTarget:
   bool CanAcceptEvent(const ui::Event& event) override;
   EventTarget* GetParentTarget() override;
   std::unique_ptr<ui::EventTargetIterator> GetChildIterator() const override;
   ui::EventTargeter* GetEventTargeter() override;
 
   // Overridden from aura::client::ActivationChangeObserver:
   void OnWindowActivated(
       aura::client::ActivationChangeObserver::ActivationReason reason,
       aura::Window* gained_active,
@@ skipping 139 matching lines @@
   base::SequencedWorkerPool* blocking_pool_;
 
   bool in_mus_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_