Chromium roll (https://codereview.chromium.org/976353002)

services/window_manager/focus_controller.h

 // Copyright 2014 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 SERVICES_WINDOW_MANAGER_FOCUS_CONTROLLER_H_
 #define SERVICES_WINDOW_MANAGER_FOCUS_CONTROLLER_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/scoped_observer.h"
 #include "mojo/services/view_manager/public/cpp/view_observer.h"
 #include "ui/events/event_handler.h"
 
 namespace window_manager {
 
 class FocusControllerObserver;
 class FocusRules;
 
 // FocusController handles focus and activation changes in a mojo window
 // manager. Within the window manager, there can only be one focused and one
 // active window at a time. When focus or activation changes, notifications are
 // sent using the FocusControllerObserver interface.
 class FocusController : public ui::EventHandler, public mojo::ViewObserver {
  public:
   // |rules| cannot be null.
   explicit FocusController(scoped_ptr<FocusRules> rules);
-  virtual ~FocusController();
+  ~FocusController() override;
 
   void AddObserver(FocusControllerObserver* observer);
   void RemoveObserver(FocusControllerObserver* observer);
 
   void ActivateView(mojo::View* view);
   void DeactivateView(mojo::View* view);
   mojo::View* GetActiveView();
   mojo::View* GetActivatableView(mojo::View* view);
   mojo::View* GetToplevelView(mojo::View* view);
   bool CanActivateView(mojo::View* view) const;
@@ skipping 54 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(FocusController);
 };
 
 // Sets/Gets the focus controller for a view.
 void SetFocusController(mojo::View* view, FocusController* focus_controller);
 FocusController* GetFocusController(mojo::View* view);
 
 }  // namespace window_manager
 
 #endif  // SERVICES_WINDOW_MANAGER_FOCUS_CONTROLLER_H_