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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_
7 7
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 #include <X11/Xlib.h> 10 #include <X11/Xlib.h>
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 // Called when XSelection data has been copied to our process. 79 // Called when XSelection data has been copied to our process.
80 void OnSelectionNotify(const XSelectionEvent& xselection); 80 void OnSelectionNotify(const XSelectionEvent& xselection);
81 81
82 // Overridden from aura::client::DragDropClient: 82 // Overridden from aura::client::DragDropClient:
83 virtual int StartDragAndDrop( 83 virtual int StartDragAndDrop(
84 const ui::OSExchangeData& data, 84 const ui::OSExchangeData& data,
85 aura::Window* root_window, 85 aura::Window* root_window,
86 aura::Window* source_window, 86 aura::Window* source_window,
87 const gfx::Point& root_location, 87 const gfx::Point& root_location,
88 int operation, 88 int operation,
89 ui::DragDropTypes::DragEventSource source) OVERRIDE; 89 ui::DragDropTypes::DragEventSource source) override;
90 virtual void DragUpdate(aura::Window* target, 90 virtual void DragUpdate(aura::Window* target,
91 const ui::LocatedEvent& event) OVERRIDE; 91 const ui::LocatedEvent& event) override;
92 virtual void Drop(aura::Window* target, 92 virtual void Drop(aura::Window* target,
93 const ui::LocatedEvent& event) OVERRIDE; 93 const ui::LocatedEvent& event) override;
94 virtual void DragCancel() OVERRIDE; 94 virtual void DragCancel() override;
95 virtual bool IsDragDropInProgress() OVERRIDE; 95 virtual bool IsDragDropInProgress() override;
96 96
97 // Overridden from aura::WindowObserver: 97 // Overridden from aura::WindowObserver:
98 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; 98 virtual void OnWindowDestroyed(aura::Window* window) override;
99 99
100 // Overridden from X11WholeScreenMoveLoopDelegate: 100 // Overridden from X11WholeScreenMoveLoopDelegate:
101 virtual void OnMouseMovement(XMotionEvent* event) OVERRIDE; 101 virtual void OnMouseMovement(XMotionEvent* event) override;
102 virtual void OnMouseReleased() OVERRIDE; 102 virtual void OnMouseReleased() override;
103 virtual void OnMoveLoopEnded() OVERRIDE; 103 virtual void OnMoveLoopEnded() override;
104 104
105 protected: 105 protected:
106 // The following methods are virtual for the sake of testing. 106 // The following methods are virtual for the sake of testing.
107 107
108 // Creates a move loop. 108 // Creates a move loop.
109 virtual scoped_ptr<X11MoveLoop> CreateMoveLoop( 109 virtual scoped_ptr<X11MoveLoop> CreateMoveLoop(
110 X11MoveLoopDelegate* delegate); 110 X11MoveLoopDelegate* delegate);
111 111
112 // Finds the topmost X11 window at |screen_point| and returns it if it is 112 // Finds the topmost X11 window at |screen_point| and returns it if it is
113 // Xdnd aware. Returns NULL otherwise. 113 // Xdnd aware. Returns NULL otherwise.
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 gfx::NativeCursor move_grab_cursor_; 275 gfx::NativeCursor move_grab_cursor_;
276 276
277 base::WeakPtrFactory<DesktopDragDropClientAuraX11> weak_ptr_factory_; 277 base::WeakPtrFactory<DesktopDragDropClientAuraX11> weak_ptr_factory_;
278 278
279 DISALLOW_COPY_AND_ASSIGN(DesktopDragDropClientAuraX11); 279 DISALLOW_COPY_AND_ASSIGN(DesktopDragDropClientAuraX11);
280 }; 280 };
281 281
282 } // namespace views 282 } // namespace views
283 283
284 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_ 284 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698