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

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

Issue 11570012: events: Update key-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-for-landing Created 8 years 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/corewm/window_modality_controller.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 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 // Convenience method to retrieve the InputMethod associated with the 644 // Convenience method to retrieve the InputMethod associated with the
645 // Widget that contains this view. Returns NULL if this view is not part of a 645 // Widget that contains this view. Returns NULL if this view is not part of a
646 // view hierarchy with a Widget. 646 // view hierarchy with a Widget.
647 virtual InputMethod* GetInputMethod(); 647 virtual InputMethod* GetInputMethod();
648 648
649 // Overridden from ui::EventTarget: 649 // Overridden from ui::EventTarget:
650 virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE; 650 virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE;
651 virtual ui::EventTarget* GetParentTarget() OVERRIDE; 651 virtual ui::EventTarget* GetParentTarget() OVERRIDE;
652 652
653 // Overridden from ui::EventHandler: 653 // Overridden from ui::EventHandler:
654 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 654 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
655 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 655 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
656 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 656 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
657 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 657 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
658 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 658 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
659 659
660 // Accelerators -------------------------------------------------------------- 660 // Accelerators --------------------------------------------------------------
661 661
662 // Sets a keyboard accelerator for that view. When the user presses the 662 // Sets a keyboard accelerator for that view. When the user presses the
663 // accelerator key combination, the AcceleratorPressed method is invoked. 663 // accelerator key combination, the AcceleratorPressed method is invoked.
664 // Note that you can set multiple accelerators for a view by invoking this 664 // Note that you can set multiple accelerators for a view by invoking this
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after
1492 base::win::ScopedComPtr<NativeViewAccessibilityWin> 1492 base::win::ScopedComPtr<NativeViewAccessibilityWin>
1493 native_view_accessibility_win_; 1493 native_view_accessibility_win_;
1494 #endif 1494 #endif
1495 1495
1496 DISALLOW_COPY_AND_ASSIGN(View); 1496 DISALLOW_COPY_AND_ASSIGN(View);
1497 }; 1497 };
1498 1498
1499 } // namespace views 1499 } // namespace views
1500 1500
1501 #endif // UI_VIEWS_VIEW_H_ 1501 #endif // UI_VIEWS_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/corewm/window_modality_controller.cc ('k') | ui/views/view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698