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

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

Issue 8491035: Revert 109583 - Move views/ime/text_input_client.h to ui/base/ime/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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_TEXTFIELD_H_ 5 #ifndef VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
6 #define VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ 6 #define VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
7 #pragma once 7 #pragma once
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 10
(...skipping 13 matching lines...) Expand all
24 #if !defined(OS_LINUX) 24 #if !defined(OS_LINUX)
25 #include "base/logging.h" 25 #include "base/logging.h"
26 #endif 26 #endif
27 27
28 namespace gfx { 28 namespace gfx {
29 struct StyleRange; 29 struct StyleRange;
30 } // namespace gfx 30 } // namespace gfx
31 31
32 namespace ui { 32 namespace ui {
33 class Range; 33 class Range;
34 class TextInputClient;
35 } // namespace ui 34 } // namespace ui
36 35
37 namespace views { 36 namespace views {
38 37
39 class KeyEvent; 38 class KeyEvent;
40 class TextfieldController; 39 class TextfieldController;
41 40
42 // This class implements a View that wraps a native text (edit) field. 41 // This class implements a View that wraps a native text (edit) field.
43 class VIEWS_EXPORT Textfield : public View { 42 class VIEWS_EXPORT Textfield : public View {
44 public: 43 public:
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE; 228 virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
230 virtual bool SkipDefaultKeyEventProcessing(const KeyEvent& e) OVERRIDE; 229 virtual bool SkipDefaultKeyEventProcessing(const KeyEvent& e) OVERRIDE;
231 virtual void OnEnabledChanged() OVERRIDE; 230 virtual void OnEnabledChanged() OVERRIDE;
232 virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE; 231 virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;
233 virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE; 232 virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
234 virtual bool OnKeyPressed(const views::KeyEvent& e) OVERRIDE; 233 virtual bool OnKeyPressed(const views::KeyEvent& e) OVERRIDE;
235 virtual bool OnKeyReleased(const views::KeyEvent& e) OVERRIDE; 234 virtual bool OnKeyReleased(const views::KeyEvent& e) OVERRIDE;
236 virtual void OnFocus() OVERRIDE; 235 virtual void OnFocus() OVERRIDE;
237 virtual void OnBlur() OVERRIDE; 236 virtual void OnBlur() OVERRIDE;
238 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 237 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
239 virtual ui::TextInputClient* GetTextInputClient() OVERRIDE; 238 virtual TextInputClient* GetTextInputClient() OVERRIDE;
240 239
241 protected: 240 protected:
242 virtual void ViewHierarchyChanged(bool is_add, View* parent, 241 virtual void ViewHierarchyChanged(bool is_add, View* parent,
243 View* child) OVERRIDE; 242 View* child) OVERRIDE;
244 virtual std::string GetClassName() const OVERRIDE; 243 virtual std::string GetClassName() const OVERRIDE;
245 244
246 // The object that actually implements the native text field. 245 // The object that actually implements the native text field.
247 NativeTextfieldWrapper* native_wrapper_; 246 NativeTextfieldWrapper* native_wrapper_;
248 247
249 private: 248 private:
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 305
307 // The input type of this text field. 306 // The input type of this text field.
308 ui::TextInputType text_input_type_; 307 ui::TextInputType text_input_type_;
309 308
310 DISALLOW_COPY_AND_ASSIGN(Textfield); 309 DISALLOW_COPY_AND_ASSIGN(Textfield);
311 }; 310 };
312 311
313 } // namespace views 312 } // namespace views
314 313
315 #endif // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ 314 #endif // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
OLDNEW
« no previous file with comments | « views/controls/textfield/native_textfield_wrapper.h ('k') | views/controls/textfield/textfield.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698