| Index: ui/views/controls/combobox/native_combobox_views.h
|
| ===================================================================
|
| --- ui/views/controls/combobox/native_combobox_views.h (revision 150588)
|
| +++ ui/views/controls/combobox/native_combobox_views.h (working copy)
|
| @@ -35,8 +35,8 @@
|
| virtual bool OnMouseDragged(const views::MouseEvent& mouse_event) OVERRIDE;
|
| virtual ui::GestureStatus OnGestureEvent(
|
| const views::GestureEvent& gesture_event) OVERRIDE;
|
| - virtual bool OnKeyPressed(const views::KeyEvent& key_event) OVERRIDE;
|
| - virtual bool OnKeyReleased(const views::KeyEvent& key_event) OVERRIDE;
|
| + virtual bool OnKeyPressed(const ui::KeyEvent& key_event) OVERRIDE;
|
| + virtual bool OnKeyReleased(const ui::KeyEvent& key_event) OVERRIDE;
|
| virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| virtual void OnFocus() OVERRIDE;
|
| virtual void OnBlur() OVERRIDE;
|
| @@ -50,8 +50,8 @@
|
| virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| virtual View* GetView() OVERRIDE;
|
| virtual void SetFocus() OVERRIDE;
|
| - virtual bool HandleKeyPressed(const views::KeyEvent& event) OVERRIDE;
|
| - virtual bool HandleKeyReleased(const views::KeyEvent& event) OVERRIDE;
|
| + virtual bool HandleKeyPressed(const ui::KeyEvent& event) OVERRIDE;
|
| + virtual bool HandleKeyReleased(const ui::KeyEvent& event) OVERRIDE;
|
| virtual void HandleFocus() OVERRIDE;
|
| virtual void HandleBlur() OVERRIDE;
|
| virtual gfx::NativeView GetTestingHandle() const OVERRIDE;
|
|
|