Pointer watcher modifications to support laser pointer.

ash/aura/wm_shell_aura.h

 // Copyright 2016 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_AURA_WM_SHELL_AURA_H_
 #define ASH_AURA_WM_SHELL_AURA_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 51 matching lines @@
   CreateScopedDisableInternalMouseAndKeyboard() override;
   std::unique_ptr<WmImmersiveFullscreenController>
   CreateImmersiveFullscreenController() override;
   void OnOverviewModeStarting() override;
   void OnOverviewModeEnded() override;
   SessionStateDelegate* GetSessionStateDelegate() override;
   void AddActivationObserver(WmActivationObserver* observer) override;
   void RemoveActivationObserver(WmActivationObserver* observer) override;
   void AddDisplayObserver(WmDisplayObserver* observer) override;
   void RemoveDisplayObserver(WmDisplayObserver* observer) override;
-  void AddPointerWatcher(views::PointerWatcher* watcher) override;
+  void AddPointerWatcher(views::PointerWatcher* watcher,

[jdufault, 2016/08/11 23:41:54]

Default arguments are banned on virtual functions.

+                         bool wants_moves = false) override;
   void RemovePointerWatcher(views::PointerWatcher* watcher) override;
   bool IsTouchDown() override;
 #if defined(OS_CHROMEOS)
   void ToggleIgnoreExternalKeyboard() override;
 #endif
 
  private:
   // aura::client::ActivationChangeObserver:
   void OnWindowActivated(ActivationReason reason,
                          aura::Window* gained_active,
@@ skipping 11 matching lines @@
 
   bool added_display_observer_ = false;
   base::ObserverList<WmDisplayObserver> display_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmShellAura);
 };
 
 }  // namespace ash
 
 #endif  // ASH_AURA_WM_SHELL_AURA_H_