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

Side by Side Diff: ui/views/widget/native_widget_aura.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/view_unittest.cc ('k') | ui/views/widget/native_widget_aura.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_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
7 7
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "ui/aura/client/activation_delegate.h" 10 #include "ui/aura/client/activation_delegate.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE; 117 virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE;
118 virtual void ClearNativeFocus() OVERRIDE; 118 virtual void ClearNativeFocus() OVERRIDE;
119 virtual void FocusNativeView(gfx::NativeView native_view) OVERRIDE; 119 virtual void FocusNativeView(gfx::NativeView native_view) OVERRIDE;
120 virtual gfx::Rect GetWorkAreaBoundsInScreen() const OVERRIDE; 120 virtual gfx::Rect GetWorkAreaBoundsInScreen() const OVERRIDE;
121 virtual void SetInactiveRenderingDisabled(bool value) OVERRIDE; 121 virtual void SetInactiveRenderingDisabled(bool value) OVERRIDE;
122 virtual Widget::MoveLoopResult RunMoveLoop() OVERRIDE; 122 virtual Widget::MoveLoopResult RunMoveLoop() OVERRIDE;
123 virtual void EndMoveLoop() OVERRIDE; 123 virtual void EndMoveLoop() OVERRIDE;
124 virtual void SetVisibilityChangedAnimationsEnabled(bool value) OVERRIDE; 124 virtual void SetVisibilityChangedAnimationsEnabled(bool value) OVERRIDE;
125 125
126 // Overridden from views::InputMethodDelegate: 126 // Overridden from views::InputMethodDelegate:
127 virtual void DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE; 127 virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) OVERRIDE;
128 128
129 // Overridden from aura::WindowDelegate: 129 // Overridden from aura::WindowDelegate:
130 virtual gfx::Size GetMinimumSize() const OVERRIDE; 130 virtual gfx::Size GetMinimumSize() const OVERRIDE;
131 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, 131 virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
132 const gfx::Rect& new_bounds) OVERRIDE; 132 const gfx::Rect& new_bounds) OVERRIDE;
133 virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE; 133 virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE;
134 virtual void OnBlur() OVERRIDE; 134 virtual void OnBlur() OVERRIDE;
135 virtual bool OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 135 virtual bool OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
136 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; 136 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE;
137 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; 137 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 203
204 scoped_ptr<DropHelper> drop_helper_; 204 scoped_ptr<DropHelper> drop_helper_;
205 int last_drop_operation_; 205 int last_drop_operation_;
206 206
207 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); 207 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
208 }; 208 };
209 209
210 } // namespace views 210 } // namespace views
211 211
212 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 212 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/view_unittest.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698