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

Side by Side Diff: ui/views/widget/native_widget_delegate.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/native_widget_aura.cc ('k') | ui/views/widget/native_widget_win.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 (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_NATIVE_WIDGET_DELEGATE_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_DELEGATE_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_DELEGATE_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_DELEGATE_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "ui/base/events.h" 10 #include "ui/base/events.h"
11 #include "ui/views/views_export.h" 11 #include "ui/views/views_export.h"
12 12
13 namespace gfx { 13 namespace gfx {
14 class Canvas; 14 class Canvas;
15 class Path; 15 class Path;
16 class Point; 16 class Point;
17 class Size; 17 class Size;
18 } 18 }
19 19
20 namespace ui { 20 namespace ui {
21 class KeyEvent;
21 class Layer; 22 class Layer;
22 } 23 }
23 24
24 namespace views { 25 namespace views {
25 class InputMethod; 26 class InputMethod;
26 class GestureEvent; 27 class GestureEvent;
27 class KeyEvent;
28 class MouseEvent; 28 class MouseEvent;
29 class TouchEvent; 29 class TouchEvent;
30 30
31 namespace internal { 31 namespace internal {
32 32
33 //////////////////////////////////////////////////////////////////////////////// 33 ////////////////////////////////////////////////////////////////////////////////
34 // NativeWidgetDelegate 34 // NativeWidgetDelegate
35 // 35 //
36 // An interface implemented by the object that handles events sent by a 36 // An interface implemented by the object that handles events sent by a
37 // NativeWidget implementation. 37 // NativeWidget implementation.
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 // Paints the rootview in the canvas. This will also refresh the compositor 99 // Paints the rootview in the canvas. This will also refresh the compositor
100 // tree if necessary when accelerated painting is enabled. 100 // tree if necessary when accelerated painting is enabled.
101 virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) = 0; 101 virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) = 0;
102 102
103 // Returns the non-client component (see ui/base/hit_test.h) containing 103 // Returns the non-client component (see ui/base/hit_test.h) containing
104 // |point|, in client coordinates. 104 // |point|, in client coordinates.
105 virtual int GetNonClientComponent(const gfx::Point& point) = 0; 105 virtual int GetNonClientComponent(const gfx::Point& point) = 0;
106 106
107 // Mouse and key event handlers. 107 // Mouse and key event handlers.
108 virtual bool OnKeyEvent(const KeyEvent& event) = 0; 108 virtual bool OnKeyEvent(const ui::KeyEvent& event) = 0;
109 virtual bool OnMouseEvent(const MouseEvent& event) = 0; 109 virtual bool OnMouseEvent(const MouseEvent& event) = 0;
110 virtual void OnMouseCaptureLost() = 0; 110 virtual void OnMouseCaptureLost() = 0;
111 virtual ui::TouchStatus OnTouchEvent(const TouchEvent& event) = 0; 111 virtual ui::TouchStatus OnTouchEvent(const TouchEvent& event) = 0;
112 virtual ui::GestureStatus OnGestureEvent(const GestureEvent& event) = 0; 112 virtual ui::GestureStatus OnGestureEvent(const GestureEvent& event) = 0;
113 113
114 // Runs the specified native command. Returns true if the command is handled. 114 // Runs the specified native command. Returns true if the command is handled.
115 virtual bool ExecuteCommand(int command_id) = 0; 115 virtual bool ExecuteCommand(int command_id) = 0;
116 116
117 // Returns the input method of the widget this delegate is associated with. 117 // Returns the input method of the widget this delegate is associated with.
118 // Note that this does not use the top level widget, so may return NULL 118 // Note that this does not use the top level widget, so may return NULL
(...skipping 11 matching lines...) Expand all
130 130
131 // 131 //
132 virtual Widget* AsWidget() = 0; 132 virtual Widget* AsWidget() = 0;
133 virtual const Widget* AsWidget() const = 0; 133 virtual const Widget* AsWidget() const = 0;
134 }; 134 };
135 135
136 } // namespace internal 136 } // namespace internal
137 } // namespace views 137 } // namespace views
138 138
139 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_DELEGATE_H_ 139 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_DELEGATE_H_
OLDNEW
« no previous file with comments | « ui/views/widget/native_widget_aura.cc ('k') | ui/views/widget/native_widget_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698