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

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

Issue 7104013: Convert NativeTextFieldViews context menu from Menu2 to MenuItemView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test. Created 9 years, 6 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_ 5 #ifndef VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
6 #define VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_ 6 #define VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/string16.h" 9 #include "base/string16.h"
10 #include "base/task.h" 10 #include "base/task.h"
(...skipping 10 matching lines...) Expand all
21 } 21 }
22 22
23 namespace gfx { 23 namespace gfx {
24 class Canvas; 24 class Canvas;
25 } 25 }
26 26
27 namespace views { 27 namespace views {
28 28
29 class FocusableBorder; 29 class FocusableBorder;
30 class KeyEvent; 30 class KeyEvent;
31 class Menu2;
32 31
33 // A views/skia only implementation of NativeTextfieldWrapper. 32 // A views/skia only implementation of NativeTextfieldWrapper.
34 // No platform specific code is used. 33 // No platform specific code is used.
35 // Following features are not yet supported. 34 // Following features are not yet supported.
36 // * BIDI/Complex script. 35 // * BIDI/Complex script.
37 // * Support surrogate pair, or maybe we should just use UTF32 internally. 36 // * Support surrogate pair, or maybe we should just use UTF32 internally.
38 // * X selection (only if we want to support). 37 // * X selection (only if we want to support).
39 // * STYLE_MULTILINE, STYLE_LOWERCASE text. (These are not used in 38 // * STYLE_MULTILINE, STYLE_LOWERCASE text. (These are not used in
40 // chromeos, so we may not need them) 39 // chromeos, so we may not need them)
41 // Once completed, this will replace Textfield, NativeTextfieldWin and 40 // Once completed, this will replace Textfield, NativeTextfieldWin and
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 // A runnable method factory for callback to update the cursor. 259 // A runnable method factory for callback to update the cursor.
261 ScopedRunnableMethodFactory<NativeTextfieldViews> cursor_timer_; 260 ScopedRunnableMethodFactory<NativeTextfieldViews> cursor_timer_;
262 261
263 // State variables used to track double and triple clicks. 262 // State variables used to track double and triple clicks.
264 size_t aggregated_clicks_; 263 size_t aggregated_clicks_;
265 base::Time last_click_time_; 264 base::Time last_click_time_;
266 gfx::Point last_click_location_; 265 gfx::Point last_click_location_;
267 266
268 // Context menu and its content list for the textfield. 267 // Context menu and its content list for the textfield.
269 scoped_ptr<ui::SimpleMenuModel> context_menu_contents_; 268 scoped_ptr<ui::SimpleMenuModel> context_menu_contents_;
270 scoped_ptr<Menu2> context_menu_menu_;
271 269
272 DISALLOW_COPY_AND_ASSIGN(NativeTextfieldViews); 270 DISALLOW_COPY_AND_ASSIGN(NativeTextfieldViews);
273 }; 271 };
274 272
275 } // namespace views 273 } // namespace views
276 274
277 #endif // VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_ 275 #endif // VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
OLDNEW
« no previous file with comments | « no previous file | views/controls/textfield/native_textfield_views.cc » ('j') | views/controls/textfield/native_textfield_views.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698