ui/views/controls/textfield/native_textfield_win.h - Issue 25039002: Always aligns text at vertically center (Textfield, Label).

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

Issue 25039002: Always aligns text at vertically center (Textfield, Label). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed unittests. Created 7 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

« ui/gfx/render_text.cc ('K') | « ui/views/controls/textfield/native_textfield_views_unittest.cc ('k') | ui/views/controls/textfield/native_textfield_win.cc » ('j') | no next file with comments »

OLD	NEW
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_WIN_H_	5 #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_

6 #define UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_	6 #define UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_

7	7

8 #include <atlbase.h>	8 #include <atlbase.h>

9 #include <atlapp.h>	9 #include <atlapp.h>

10 #include <atlcrack.h>	10 #include <atlcrack.h>

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
68 virtual void UpdateBorder() OVERRIDE;	68 virtual void UpdateBorder() OVERRIDE;

69 virtual void UpdateTextColor() OVERRIDE;	69 virtual void UpdateTextColor() OVERRIDE;

70 virtual void UpdateBackgroundColor() OVERRIDE;	70 virtual void UpdateBackgroundColor() OVERRIDE;

71 virtual void UpdateReadOnly() OVERRIDE;	71 virtual void UpdateReadOnly() OVERRIDE;

72 virtual void UpdateFont() OVERRIDE;	72 virtual void UpdateFont() OVERRIDE;

73 virtual void UpdateIsObscured() OVERRIDE;	73 virtual void UpdateIsObscured() OVERRIDE;

74 virtual void UpdateEnabled() OVERRIDE;	74 virtual void UpdateEnabled() OVERRIDE;

75 virtual gfx::Insets CalculateInsets() OVERRIDE;	75 virtual gfx::Insets CalculateInsets() OVERRIDE;

76 virtual void UpdateHorizontalMargins() OVERRIDE;	76 virtual void UpdateHorizontalMargins() OVERRIDE;

77 virtual void UpdateVerticalMargins() OVERRIDE;	77 virtual void UpdateVerticalMargins() OVERRIDE;

78 virtual void UpdateVerticalAlignment() OVERRIDE;

79 virtual bool SetFocus() OVERRIDE;	78 virtual bool SetFocus() OVERRIDE;

80 virtual View* GetView() OVERRIDE;	79 virtual View* GetView() OVERRIDE;

81 virtual gfx::NativeView GetTestingHandle() const OVERRIDE;	80 virtual gfx::NativeView GetTestingHandle() const OVERRIDE;

82 virtual bool IsIMEComposing() const OVERRIDE;	81 virtual bool IsIMEComposing() const OVERRIDE;

83 virtual gfx::Range GetSelectedRange() const OVERRIDE;	82 virtual gfx::Range GetSelectedRange() const OVERRIDE;

84 virtual void SelectRange(const gfx::Range& range) OVERRIDE;	83 virtual void SelectRange(const gfx::Range& range) OVERRIDE;

85 virtual gfx::SelectionModel GetSelectionModel() const OVERRIDE;	84 virtual gfx::SelectionModel GetSelectionModel() const OVERRIDE;

86 virtual void SelectSelectionModel(const gfx::SelectionModel& sel) OVERRIDE;	85 virtual void SelectSelectionModel(const gfx::SelectionModel& sel) OVERRIDE;

87 virtual size_t GetCursorPosition() const OVERRIDE;	86 virtual size_t GetCursorPosition() const OVERRIDE;

88 virtual bool GetCursorEnabled() const OVERRIDE;	87 virtual bool GetCursorEnabled() const OVERRIDE;

(...skipping 231 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
320 int accessibility_state_;	319 int accessibility_state_;

321	320

322 scoped_ptr<ui::TSFEventRouter> tsf_event_router_;	321 scoped_ptr<ui::TSFEventRouter> tsf_event_router_;

323	322

324 DISALLOW_COPY_AND_ASSIGN(NativeTextfieldWin);	323 DISALLOW_COPY_AND_ASSIGN(NativeTextfieldWin);

325 };	324 };

326	325

327 } // namespace views	326 } // namespace views

328	327

329 #endif // UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_	328 #endif // UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_

OLD	NEW