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

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

Issue 10825254: Remove views::KeyEvent, replacing uses of it with ui::KeyEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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/widget/root_view.cc ('k') | ui/views/widget/widget.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_WIDGET_WIDGET_H_ 5 #ifndef UI_VIEWS_WIDGET_WIDGET_H_
6 #define UI_VIEWS_WIDGET_WIDGET_H_ 6 #define UI_VIEWS_WIDGET_WIDGET_H_
7 7
8 #include <set> 8 #include <set>
9 #include <stack> 9 #include <stack>
10 #include <vector> 10 #include <vector>
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 virtual gfx::Size GetMaximumSize() OVERRIDE; 631 virtual gfx::Size GetMaximumSize() OVERRIDE;
632 virtual void OnNativeWidgetMove() OVERRIDE; 632 virtual void OnNativeWidgetMove() OVERRIDE;
633 virtual void OnNativeWidgetSizeChanged(const gfx::Size& new_size) OVERRIDE; 633 virtual void OnNativeWidgetSizeChanged(const gfx::Size& new_size) OVERRIDE;
634 virtual void OnNativeWidgetBeginUserBoundsChange() OVERRIDE; 634 virtual void OnNativeWidgetBeginUserBoundsChange() OVERRIDE;
635 virtual void OnNativeWidgetEndUserBoundsChange() OVERRIDE; 635 virtual void OnNativeWidgetEndUserBoundsChange() OVERRIDE;
636 virtual bool HasFocusManager() const OVERRIDE; 636 virtual bool HasFocusManager() const OVERRIDE;
637 virtual bool OnNativeWidgetPaintAccelerated( 637 virtual bool OnNativeWidgetPaintAccelerated(
638 const gfx::Rect& dirty_region) OVERRIDE; 638 const gfx::Rect& dirty_region) OVERRIDE;
639 virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) OVERRIDE; 639 virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) OVERRIDE;
640 virtual int GetNonClientComponent(const gfx::Point& point) OVERRIDE; 640 virtual int GetNonClientComponent(const gfx::Point& point) OVERRIDE;
641 virtual bool OnKeyEvent(const KeyEvent& event) OVERRIDE; 641 virtual bool OnKeyEvent(const ui::KeyEvent& event) OVERRIDE;
642 virtual bool OnMouseEvent(const MouseEvent& event) OVERRIDE; 642 virtual bool OnMouseEvent(const MouseEvent& event) OVERRIDE;
643 virtual void OnMouseCaptureLost() OVERRIDE; 643 virtual void OnMouseCaptureLost() OVERRIDE;
644 virtual ui::TouchStatus OnTouchEvent(const TouchEvent& event) OVERRIDE; 644 virtual ui::TouchStatus OnTouchEvent(const TouchEvent& event) OVERRIDE;
645 virtual ui::GestureStatus OnGestureEvent(const GestureEvent& event) OVERRIDE; 645 virtual ui::GestureStatus OnGestureEvent(const GestureEvent& event) OVERRIDE;
646 virtual bool ExecuteCommand(int command_id) OVERRIDE; 646 virtual bool ExecuteCommand(int command_id) OVERRIDE;
647 virtual InputMethod* GetInputMethodDirect() OVERRIDE; 647 virtual InputMethod* GetInputMethodDirect() OVERRIDE;
648 virtual const std::vector<ui::Layer*>& GetRootLayers() OVERRIDE; 648 virtual const std::vector<ui::Layer*>& GetRootLayers() OVERRIDE;
649 virtual bool HasHitTestMask() const OVERRIDE; 649 virtual bool HasHitTestMask() const OVERRIDE;
650 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; 650 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
651 virtual Widget* AsWidget() OVERRIDE; 651 virtual Widget* AsWidget() OVERRIDE;
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 794
795 // Is |root_layers_| out of date? 795 // Is |root_layers_| out of date?
796 bool root_layers_dirty_; 796 bool root_layers_dirty_;
797 797
798 DISALLOW_COPY_AND_ASSIGN(Widget); 798 DISALLOW_COPY_AND_ASSIGN(Widget);
799 }; 799 };
800 800
801 } // namespace views 801 } // namespace views
802 802
803 #endif // UI_VIEWS_WIDGET_WIDGET_H_ 803 #endif // UI_VIEWS_WIDGET_WIDGET_H_
OLDNEW
« no previous file with comments | « ui/views/widget/root_view.cc ('k') | ui/views/widget/widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698