Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Side by Side Diff: ash/wm/toplevel_window_event_handler.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_ 5 #ifndef ASH_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
6 #define ASH_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_ 6 #define ASH_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 21 matching lines...) Expand all
32 32
33 class ASH_EXPORT ToplevelWindowEventHandler 33 class ASH_EXPORT ToplevelWindowEventHandler
34 : public ui::EventHandler, 34 : public ui::EventHandler,
35 public aura::client::WindowMoveClient, 35 public aura::client::WindowMoveClient,
36 public DisplayController::Observer { 36 public DisplayController::Observer {
37 public: 37 public:
38 ToplevelWindowEventHandler(); 38 ToplevelWindowEventHandler();
39 virtual ~ToplevelWindowEventHandler(); 39 virtual ~ToplevelWindowEventHandler();
40 40
41 // Overridden from ui::EventHandler: 41 // Overridden from ui::EventHandler:
42 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 42 virtual void OnKeyEvent(ui::KeyEvent* event) override;
43 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 43 virtual void OnMouseEvent(ui::MouseEvent* event) override;
44 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 44 virtual void OnGestureEvent(ui::GestureEvent* event) override;
45 45
46 // Overridden form aura::client::WindowMoveClient: 46 // Overridden form aura::client::WindowMoveClient:
47 virtual aura::client::WindowMoveResult RunMoveLoop( 47 virtual aura::client::WindowMoveResult RunMoveLoop(
48 aura::Window* source, 48 aura::Window* source,
49 const gfx::Vector2d& drag_offset, 49 const gfx::Vector2d& drag_offset,
50 aura::client::WindowMoveSource move_source) OVERRIDE; 50 aura::client::WindowMoveSource move_source) override;
51 virtual void EndMoveLoop() OVERRIDE; 51 virtual void EndMoveLoop() override;
52 52
53 // Overridden form ash::DisplayController::Observer: 53 // Overridden form ash::DisplayController::Observer:
54 virtual void OnDisplayConfigurationChanging() OVERRIDE; 54 virtual void OnDisplayConfigurationChanging() override;
55 55
56 private: 56 private:
57 class ScopedWindowResizer; 57 class ScopedWindowResizer;
58 58
59 enum DragCompletionStatus { 59 enum DragCompletionStatus {
60 DRAG_COMPLETE, 60 DRAG_COMPLETE,
61 DRAG_REVERT, 61 DRAG_REVERT,
62 62
63 // To be used when WindowResizer::GetTarget() is destroyed. Neither 63 // To be used when WindowResizer::GetTarget() is destroyed. Neither
64 // completes nor reverts the drag because both access the WindowResizer's 64 // completes nor reverts the drag because both access the WindowResizer's
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 // Used to track if this object is deleted while running a nested message 122 // Used to track if this object is deleted while running a nested message
123 // loop. If non-null the destructor sets this to true. 123 // loop. If non-null the destructor sets this to true.
124 bool* destroyed_; 124 bool* destroyed_;
125 125
126 DISALLOW_COPY_AND_ASSIGN(ToplevelWindowEventHandler); 126 DISALLOW_COPY_AND_ASSIGN(ToplevelWindowEventHandler);
127 }; 127 };
128 128
129 } // namespace aura 129 } // namespace aura
130 130
131 #endif // ASH_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_ 131 #endif // ASH_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
OLDNEW
« no previous file with comments | « ash/wm/system_modal_container_layout_manager_unittest.cc ('k') | ash/wm/toplevel_window_event_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698