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

Side by Side Diff: ui/views/view.h

Issue 339713005: Remove MaskedViewTargeter and its derived classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/masked_view_targeter.cc ('k') | ui/views/view.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 (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_VIEW_H_ 5 #ifndef UI_VIEWS_VIEW_H_
6 #define UI_VIEWS_VIEW_H_ 6 #define UI_VIEWS_VIEW_H_
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
725 scoped_ptr<ui::EventTargeter> targeter); 725 scoped_ptr<ui::EventTargeter> targeter);
726 726
727 // Overridden from ui::EventTarget: 727 // Overridden from ui::EventTarget:
728 virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE; 728 virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE;
729 virtual ui::EventTarget* GetParentTarget() OVERRIDE; 729 virtual ui::EventTarget* GetParentTarget() OVERRIDE;
730 virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const OVERRIDE; 730 virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const OVERRIDE;
731 virtual ui::EventTargeter* GetEventTargeter() OVERRIDE; 731 virtual ui::EventTargeter* GetEventTargeter() OVERRIDE;
732 virtual void ConvertEventToTarget(ui::EventTarget* target, 732 virtual void ConvertEventToTarget(ui::EventTarget* target,
733 ui::LocatedEvent* event) OVERRIDE; 733 ui::LocatedEvent* event) OVERRIDE;
734 734
735 const ui::EventTargeter* GetEventTargeter() const;
736
737 // Overridden from ui::EventHandler: 735 // Overridden from ui::EventHandler:
738 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 736 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
739 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 737 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
740 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 738 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
741 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE FINAL; 739 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE FINAL;
742 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 740 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
743 741
744 // Accelerators -------------------------------------------------------------- 742 // Accelerators --------------------------------------------------------------
745 743
746 // Sets a keyboard accelerator for that view. When the user presses the 744 // Sets a keyboard accelerator for that view. When the user presses the
(...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after
1613 // Belongs to this view, but it's reference-counted on some platforms 1611 // Belongs to this view, but it's reference-counted on some platforms
1614 // so we can't use a scoped_ptr. It's dereferenced in the destructor. 1612 // so we can't use a scoped_ptr. It's dereferenced in the destructor.
1615 NativeViewAccessibility* native_view_accessibility_; 1613 NativeViewAccessibility* native_view_accessibility_;
1616 1614
1617 DISALLOW_COPY_AND_ASSIGN(View); 1615 DISALLOW_COPY_AND_ASSIGN(View);
1618 }; 1616 };
1619 1617
1620 } // namespace views 1618 } // namespace views
1621 1619
1622 #endif // UI_VIEWS_VIEW_H_ 1620 #endif // UI_VIEWS_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/masked_view_targeter.cc ('k') | ui/views/view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698