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

Side by Side Diff: ui/views/controls/textfield/native_textfield_views.h

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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/controls/slider.cc ('k') | ui/views/controls/textfield/native_textfield_views.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_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_ 5 #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
6 #define UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_ 6 #define UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "base/string16.h" 9 #include "base/string16.h"
10 #include "ui/base/events.h" 10 #include "ui/base/events.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 public TextfieldViewsModel::Delegate { 49 public TextfieldViewsModel::Delegate {
50 public: 50 public:
51 explicit NativeTextfieldViews(Textfield* parent); 51 explicit NativeTextfieldViews(Textfield* parent);
52 virtual ~NativeTextfieldViews(); 52 virtual ~NativeTextfieldViews();
53 53
54 // View overrides: 54 // View overrides:
55 virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE; 55 virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE;
56 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; 56 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
57 virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; 57 virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE;
58 virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; 58 virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
59 virtual ui::GestureStatus OnGestureEvent( 59 virtual ui::EventResult OnGestureEvent(
60 const ui::GestureEvent& event) OVERRIDE; 60 const ui::GestureEvent& event) OVERRIDE;
61 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; 61 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
62 virtual bool GetDropFormats( 62 virtual bool GetDropFormats(
63 int* formats, 63 int* formats,
64 std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; 64 std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
65 virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE; 65 virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE;
66 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; 66 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
67 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; 67 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
68 virtual void OnDragDone() OVERRIDE; 68 virtual void OnDragDone() OVERRIDE;
69 virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE; 69 virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE;
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 scoped_ptr<views::MenuRunner> context_menu_runner_; 282 scoped_ptr<views::MenuRunner> context_menu_runner_;
283 283
284 scoped_ptr<TouchSelectionController> touch_selection_controller_; 284 scoped_ptr<TouchSelectionController> touch_selection_controller_;
285 285
286 DISALLOW_COPY_AND_ASSIGN(NativeTextfieldViews); 286 DISALLOW_COPY_AND_ASSIGN(NativeTextfieldViews);
287 }; 287 };
288 288
289 } // namespace views 289 } // namespace views
290 290
291 #endif // UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_ 291 #endif // UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
OLDNEW
« no previous file with comments | « ui/views/controls/slider.cc ('k') | ui/views/controls/textfield/native_textfield_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698