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

Side by Side Diff: ui/views/view_targeter.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
« no previous file with comments | « ui/views/view.h ('k') | ui/views/view_targeter_unittest.cc » ('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 UI_VIEWS_VIEW_TARGETER_H_ 5 #ifndef UI_VIEWS_VIEW_TARGETER_H_
6 #define UI_VIEWS_VIEW_TARGETER_H_ 6 #define UI_VIEWS_VIEW_TARGETER_H_
7 7
8 #include "ui/events/event_targeter.h" 8 #include "ui/events/event_targeter.h"
9 #include "ui/views/views_export.h" 9 #include "ui/views/views_export.h"
10 10
(...skipping 15 matching lines...) Expand all
26 26
27 // A call-through to DoesIntersectRect() on |delegate_|. 27 // A call-through to DoesIntersectRect() on |delegate_|.
28 bool DoesIntersectRect(const View* target, const gfx::Rect& rect) const; 28 bool DoesIntersectRect(const View* target, const gfx::Rect& rect) const;
29 29
30 // A call-through to TargetForRect() on |delegate_|. 30 // A call-through to TargetForRect() on |delegate_|.
31 View* TargetForRect(View* root, const gfx::Rect& rect) const; 31 View* TargetForRect(View* root, const gfx::Rect& rect) const;
32 32
33 protected: 33 protected:
34 // ui::EventTargeter: 34 // ui::EventTargeter:
35 virtual ui::EventTarget* FindTargetForEvent(ui::EventTarget* root, 35 virtual ui::EventTarget* FindTargetForEvent(ui::EventTarget* root,
36 ui::Event* event) OVERRIDE; 36 ui::Event* event) override;
37 virtual ui::EventTarget* FindNextBestTarget(ui::EventTarget* previous_target, 37 virtual ui::EventTarget* FindNextBestTarget(ui::EventTarget* previous_target,
38 ui::Event* event) OVERRIDE; 38 ui::Event* event) override;
39 virtual bool SubtreeCanAcceptEvent( 39 virtual bool SubtreeCanAcceptEvent(
40 ui::EventTarget* target, 40 ui::EventTarget* target,
41 const ui::LocatedEvent& event) const OVERRIDE; 41 const ui::LocatedEvent& event) const override;
42 virtual bool EventLocationInsideBounds( 42 virtual bool EventLocationInsideBounds(
43 ui::EventTarget* target, 43 ui::EventTarget* target,
44 const ui::LocatedEvent& event) const OVERRIDE; 44 const ui::LocatedEvent& event) const override;
45 45
46 private: 46 private:
47 // TODO(tdanderson): Un-friend RootView once RootView::DispatchGestureEvent() 47 // TODO(tdanderson): Un-friend RootView once RootView::DispatchGestureEvent()
48 // has been removed. 48 // has been removed.
49 friend class internal::RootView; 49 friend class internal::RootView;
50 50
51 View* FindTargetForKeyEvent(View* root, const ui::KeyEvent& key); 51 View* FindTargetForKeyEvent(View* root, const ui::KeyEvent& key);
52 View* FindTargetForScrollEvent(View* root, const ui::ScrollEvent& scroll); 52 View* FindTargetForScrollEvent(View* root, const ui::ScrollEvent& scroll);
53 53
54 virtual View* FindTargetForGestureEvent(View* root, 54 virtual View* FindTargetForGestureEvent(View* root,
55 const ui::GestureEvent& gesture); 55 const ui::GestureEvent& gesture);
56 virtual ui::EventTarget* FindNextBestTargetForGestureEvent( 56 virtual ui::EventTarget* FindNextBestTargetForGestureEvent(
57 ui::EventTarget* previous_target, 57 ui::EventTarget* previous_target,
58 const ui::GestureEvent& gesture); 58 const ui::GestureEvent& gesture);
59 59
60 // ViewTargeter does not own the |delegate_|, but |delegate_| must 60 // ViewTargeter does not own the |delegate_|, but |delegate_| must
61 // outlive the targeter. 61 // outlive the targeter.
62 ViewTargeterDelegate* delegate_; 62 ViewTargeterDelegate* delegate_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(ViewTargeter); 64 DISALLOW_COPY_AND_ASSIGN(ViewTargeter);
65 }; 65 };
66 66
67 } // namespace views 67 } // namespace views
68 68
69 #endif // UI_VIEWS_VIEW_TARGETER_H_ 69 #endif // UI_VIEWS_VIEW_TARGETER_H_
OLDNEW
« no previous file with comments | « ui/views/view.h ('k') | ui/views/view_targeter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698