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

Side by Side Diff: athena/wm/title_drag_controller.h

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (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
« no previous file with comments | « athena/wm/split_view_controller_unittest.cc ('k') | athena/wm/window_list_provider_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 ATHENA_WM_TITLE_DRAG_CONTROLLER_H_ 5 #ifndef ATHENA_WM_TITLE_DRAG_CONTROLLER_H_
6 #define ATHENA_WM_TITLE_DRAG_CONTROLLER_H_ 6 #define ATHENA_WM_TITLE_DRAG_CONTROLLER_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 30 matching lines...) Expand all
41 public: 41 public:
42 TitleDragController(aura::Window* container, 42 TitleDragController(aura::Window* container,
43 TitleDragControllerDelegate* delegate); 43 TitleDragControllerDelegate* delegate);
44 virtual ~TitleDragController(); 44 virtual ~TitleDragController();
45 45
46 private: 46 private:
47 void EndTransition(aura::Window* window, bool complete); 47 void EndTransition(aura::Window* window, bool complete);
48 void OnTransitionEnd(aura::Window* window, bool complete); 48 void OnTransitionEnd(aura::Window* window, bool complete);
49 49
50 // ui::EventHandler: 50 // ui::EventHandler:
51 virtual void OnGestureEvent(ui::GestureEvent* gesture) OVERRIDE; 51 virtual void OnGestureEvent(ui::GestureEvent* gesture) override;
52 52
53 aura::Window* container_; 53 aura::Window* container_;
54 TitleDragControllerDelegate* delegate_; 54 TitleDragControllerDelegate* delegate_;
55 gfx::Point drag_start_location_; 55 gfx::Point drag_start_location_;
56 scoped_ptr<wm::Shadow> shadow_; 56 scoped_ptr<wm::Shadow> shadow_;
57 aura::WindowTracker tracker_; 57 aura::WindowTracker tracker_;
58 58
59 base::WeakPtrFactory<TitleDragController> weak_ptr_; 59 base::WeakPtrFactory<TitleDragController> weak_ptr_;
60 60
61 DISALLOW_COPY_AND_ASSIGN(TitleDragController); 61 DISALLOW_COPY_AND_ASSIGN(TitleDragController);
62 }; 62 };
63 63
64 } // namespace athena 64 } // namespace athena
65 65
66 #endif // ATHENA_WM_TITLE_DRAG_CONTROLLER_H_ 66 #endif // ATHENA_WM_TITLE_DRAG_CONTROLLER_H_
OLDNEW
« no previous file with comments | « athena/wm/split_view_controller_unittest.cc ('k') | athena/wm/window_list_provider_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698