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

Side by Side Diff: ui/views/widget/desktop_aura/x11_desktop_window_move_client.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_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_
7 7
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 13 matching lines...) Expand all
24 24
25 // When we're dragging tabs, we need to manually position our window. 25 // When we're dragging tabs, we need to manually position our window.
26 class VIEWS_EXPORT X11DesktopWindowMoveClient : 26 class VIEWS_EXPORT X11DesktopWindowMoveClient :
27 public views::X11MoveLoopDelegate, 27 public views::X11MoveLoopDelegate,
28 public aura::client::WindowMoveClient { 28 public aura::client::WindowMoveClient {
29 public: 29 public:
30 X11DesktopWindowMoveClient(); 30 X11DesktopWindowMoveClient();
31 virtual ~X11DesktopWindowMoveClient(); 31 virtual ~X11DesktopWindowMoveClient();
32 32
33 // Overridden from X11WholeScreenMoveLoopDelegate: 33 // Overridden from X11WholeScreenMoveLoopDelegate:
34 virtual void OnMouseMovement(XMotionEvent* event) OVERRIDE; 34 virtual void OnMouseMovement(XMotionEvent* event) override;
35 virtual void OnMouseReleased() OVERRIDE; 35 virtual void OnMouseReleased() override;
36 virtual void OnMoveLoopEnded() OVERRIDE; 36 virtual void OnMoveLoopEnded() override;
37 37
38 // Overridden from aura::client::WindowMoveClient: 38 // Overridden from aura::client::WindowMoveClient:
39 virtual aura::client::WindowMoveResult RunMoveLoop( 39 virtual aura::client::WindowMoveResult RunMoveLoop(
40 aura::Window* window, 40 aura::Window* window,
41 const gfx::Vector2d& drag_offset, 41 const gfx::Vector2d& drag_offset,
42 aura::client::WindowMoveSource move_source) OVERRIDE; 42 aura::client::WindowMoveSource move_source) override;
43 virtual void EndMoveLoop() OVERRIDE; 43 virtual void EndMoveLoop() override;
44 44
45 private: 45 private:
46 X11WholeScreenMoveLoop move_loop_; 46 X11WholeScreenMoveLoop move_loop_;
47 47
48 // We need to keep track of this so we can actually move it when reacting to 48 // We need to keep track of this so we can actually move it when reacting to
49 // mouse events. 49 // mouse events.
50 aura::WindowTreeHost* host_; 50 aura::WindowTreeHost* host_;
51 51
52 // Our cursor offset from the top left window origin when the drag 52 // Our cursor offset from the top left window origin when the drag
53 // started. Used to calculate the window's new bounds relative to the current 53 // started. Used to calculate the window's new bounds relative to the current
54 // location of the cursor. 54 // location of the cursor.
55 gfx::Vector2d window_offset_; 55 gfx::Vector2d window_offset_;
56 }; 56 };
57 57
58 } // namespace views 58 } // namespace views
59 59
60 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_ 60 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_WINDOW_MOVE_CLIENT_H_
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/x11_desktop_handler.h ('k') | ui/views/widget/desktop_aura/x11_topmost_window_finder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698