Index: ui/views/controls/textfield/textfield.h |
diff --git a/ui/views/controls/textfield/textfield.h b/ui/views/controls/textfield/textfield.h |
index d9a899be6148b0575d93f8be4131ee302e21d952..10e48945bc258dcb41bb868698b6f7a6563a8a0e 100644 |
--- a/ui/views/controls/textfield/textfield.h |
+++ b/ui/views/controls/textfield/textfield.h |
@@ -178,26 +178,18 @@ class VIEWS_EXPORT Textfield : public View, |
bool HasTextBeingDragged(); |
// View overrides: |
- // TODO(msw): Match declaration and definition order to View. |
virtual int GetBaseline() const OVERRIDE; |
virtual gfx::Size GetPreferredSize() OVERRIDE; |
- virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE; |
- virtual bool SkipDefaultKeyEventProcessing(const ui::KeyEvent& e) OVERRIDE; |
- virtual void OnEnabledChanged() OVERRIDE; |
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |
- virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; |
+ virtual const char* GetClassName() const OVERRIDE; |
+ virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE; |
virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; |
virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; |
virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; |
- virtual void OnFocus() OVERRIDE; |
- virtual void OnBlur() OVERRIDE; |
- virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; |
+ virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; |
virtual ui::TextInputClient* GetTextInputClient() OVERRIDE; |
- virtual gfx::Point GetKeyboardContextMenuLocation() OVERRIDE; |
- virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE; |
- virtual const char* GetClassName() const OVERRIDE; |
- virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE; |
virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; |
+ virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE; |
+ virtual bool SkipDefaultKeyEventProcessing(const ui::KeyEvent& e) OVERRIDE; |
virtual bool GetDropFormats( |
int* formats, |
std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; |
@@ -206,9 +198,16 @@ class VIEWS_EXPORT Textfield : public View, |
virtual void OnDragExited() OVERRIDE; |
virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; |
virtual void OnDragDone() OVERRIDE; |
+ virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; |
virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; |
+ virtual void OnEnabledChanged() OVERRIDE; |
virtual void ViewHierarchyChanged( |
const ViewHierarchyChangedDetails& details) OVERRIDE; |
+ virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |
+ virtual void OnFocus() OVERRIDE; |
+ virtual void OnBlur() OVERRIDE; |
+ virtual gfx::Point GetKeyboardContextMenuLocation() OVERRIDE; |
+ virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE; |
// TextfieldModel::Delegate overrides: |
virtual void OnCompositionTextConfirmedOrCleared() OVERRIDE; |