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

Side by Side Diff: ui/views/widget/desktop_aura/x11_whole_screen_move_loop.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_X11_WHOLE_SCREEN_MOVE_LOOP_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 21 matching lines...) Expand all
32 32
33 // Runs a nested message loop and grabs the mouse. This is used to implement 33 // Runs a nested message loop and grabs the mouse. This is used to implement
34 // dragging. 34 // dragging.
35 class X11WholeScreenMoveLoop : public X11MoveLoop, 35 class X11WholeScreenMoveLoop : public X11MoveLoop,
36 public ui::PlatformEventDispatcher { 36 public ui::PlatformEventDispatcher {
37 public: 37 public:
38 explicit X11WholeScreenMoveLoop(X11MoveLoopDelegate* delegate); 38 explicit X11WholeScreenMoveLoop(X11MoveLoopDelegate* delegate);
39 virtual ~X11WholeScreenMoveLoop(); 39 virtual ~X11WholeScreenMoveLoop();
40 40
41 // ui:::PlatformEventDispatcher: 41 // ui:::PlatformEventDispatcher:
42 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; 42 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;
43 virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE; 43 virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
44 44
45 // X11MoveLoop: 45 // X11MoveLoop:
46 virtual bool RunMoveLoop(aura::Window* window, 46 virtual bool RunMoveLoop(aura::Window* window,
47 gfx::NativeCursor cursor) OVERRIDE; 47 gfx::NativeCursor cursor) override;
48 virtual void UpdateCursor(gfx::NativeCursor cursor) OVERRIDE; 48 virtual void UpdateCursor(gfx::NativeCursor cursor) override;
49 virtual void EndMoveLoop() OVERRIDE; 49 virtual void EndMoveLoop() override;
50 50
51 private: 51 private:
52 // Grabs the pointer, setting the mouse cursor to |cursor|. Returns true if 52 // Grabs the pointer, setting the mouse cursor to |cursor|. Returns true if
53 // successful. 53 // successful.
54 bool GrabPointer(gfx::NativeCursor cursor); 54 bool GrabPointer(gfx::NativeCursor cursor);
55 55
56 void GrabEscKey(); 56 void GrabEscKey();
57 57
58 // Creates an input-only window to be used during the drag. 58 // Creates an input-only window to be used during the drag.
59 Window CreateDragInputWindow(XDisplay* display); 59 Window CreateDragInputWindow(XDisplay* display);
(...skipping 28 matching lines...) Expand all
88 88
89 XMotionEvent last_xmotion_; 89 XMotionEvent last_xmotion_;
90 base::WeakPtrFactory<X11WholeScreenMoveLoop> weak_factory_; 90 base::WeakPtrFactory<X11WholeScreenMoveLoop> weak_factory_;
91 91
92 DISALLOW_COPY_AND_ASSIGN(X11WholeScreenMoveLoop); 92 DISALLOW_COPY_AND_ASSIGN(X11WholeScreenMoveLoop);
93 }; 93 };
94 94
95 } // namespace views 95 } // namespace views
96 96
97 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_ 97 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WHOLE_SCREEN_MOVE_LOOP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698