ui/views/controls/textfield/native_textfield_win.h - Issue 10825254: Remove views::KeyEvent, replacing uses of it with ui::KeyEvent.

Side by Side Diff: ui/views/controls/textfield/native_textfield_win.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

OLD	NEW
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_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_	5 #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_

6 #define UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_	6 #define UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_

7	7

8 #include <atlbase.h>	8 #include <atlbase.h>

9 #include <atlapp.h>	9 #include <atlapp.h>

10 #include <atlcrack.h>	10 #include <atlcrack.h>

(...skipping 73 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
84 virtual void UpdateVerticalMargins() OVERRIDE;	84 virtual void UpdateVerticalMargins() OVERRIDE;

85 virtual bool SetFocus() OVERRIDE;	85 virtual bool SetFocus() OVERRIDE;

86 virtual View* GetView() OVERRIDE;	86 virtual View* GetView() OVERRIDE;

87 virtual gfx::NativeView GetTestingHandle() const OVERRIDE;	87 virtual gfx::NativeView GetTestingHandle() const OVERRIDE;

88 virtual bool IsIMEComposing() const OVERRIDE;	88 virtual bool IsIMEComposing() const OVERRIDE;

89 virtual void GetSelectedRange(ui::Range* range) const OVERRIDE;	89 virtual void GetSelectedRange(ui::Range* range) const OVERRIDE;

90 virtual void SelectRange(const ui::Range& range) OVERRIDE;	90 virtual void SelectRange(const ui::Range& range) OVERRIDE;

91 virtual void GetSelectionModel(gfx::SelectionModel* sel) const OVERRIDE;	91 virtual void GetSelectionModel(gfx::SelectionModel* sel) const OVERRIDE;

92 virtual void SelectSelectionModel(const gfx::SelectionModel& sel) OVERRIDE;	92 virtual void SelectSelectionModel(const gfx::SelectionModel& sel) OVERRIDE;

93 virtual size_t GetCursorPosition() const OVERRIDE;	93 virtual size_t GetCursorPosition() const OVERRIDE;

94 virtual bool HandleKeyPressed(const views::KeyEvent& event) OVERRIDE;	94 virtual bool HandleKeyPressed(const ui::KeyEvent& event) OVERRIDE;

95 virtual bool HandleKeyReleased(const views::KeyEvent& event) OVERRIDE;	95 virtual bool HandleKeyReleased(const ui::KeyEvent& event) OVERRIDE;

96 virtual void HandleFocus() OVERRIDE;	96 virtual void HandleFocus() OVERRIDE;

97 virtual void HandleBlur() OVERRIDE;	97 virtual void HandleBlur() OVERRIDE;

98 virtual ui::TextInputClient* GetTextInputClient() OVERRIDE;	98 virtual ui::TextInputClient* GetTextInputClient() OVERRIDE;

99 virtual void ApplyStyleRange(const gfx::StyleRange& style) OVERRIDE;	99 virtual void ApplyStyleRange(const gfx::StyleRange& style) OVERRIDE;

100 virtual void ApplyDefaultStyle() OVERRIDE;	100 virtual void ApplyDefaultStyle() OVERRIDE;

101 virtual void ClearEditHistory() OVERRIDE;	101 virtual void ClearEditHistory() OVERRIDE;

102 virtual int GetFontHeight() OVERRIDE;	102 virtual int GetFontHeight() OVERRIDE;

103	103

104 // Overridden from ui::SimpleMenuModel::Delegate:	104 // Overridden from ui::SimpleMenuModel::Delegate:

105 virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;	105 virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;

(...skipping 192 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
298	298

299 // The accessibility state of this object.	299 // The accessibility state of this object.

300 int accessibility_state_;	300 int accessibility_state_;

301	301

302 DISALLOW_COPY_AND_ASSIGN(NativeTextfieldWin);	302 DISALLOW_COPY_AND_ASSIGN(NativeTextfieldWin);

303 };	303 };

304	304

305 } // namespace views	305 } // namespace views

306	306

307 #endif // UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_	307 #endif // UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_

OLD	NEW