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

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

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

Patch Set: Worked on pkasting's minor comment. 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_unittest.cc ('K') | « ui/gfx/text_constants.h ('k') | ui/views/controls/textfield/native_textfield_views.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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/strings/string16.h"	9 #include "base/strings/string16.h"

10 #include "base/timer/timer.h"	10 #include "base/timer/timer.h"

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

114 virtual void UpdateTextColor() OVERRIDE;	114 virtual void UpdateTextColor() OVERRIDE;

115 virtual void UpdateBackgroundColor() OVERRIDE;	115 virtual void UpdateBackgroundColor() OVERRIDE;

116 virtual void UpdateReadOnly() OVERRIDE;	116 virtual void UpdateReadOnly() OVERRIDE;

117 virtual void UpdateFont() OVERRIDE;	117 virtual void UpdateFont() OVERRIDE;

118 virtual void UpdateIsObscured() OVERRIDE;	118 virtual void UpdateIsObscured() OVERRIDE;

119 virtual void UpdateEnabled() OVERRIDE;	119 virtual void UpdateEnabled() OVERRIDE;

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

121 virtual void UpdateHorizontalMargins() OVERRIDE;	121 virtual void UpdateHorizontalMargins() OVERRIDE;

122 virtual void UpdateVerticalMargins() OVERRIDE;	122 virtual void UpdateVerticalMargins() OVERRIDE;

123 virtual void UpdateVerticalAlignment() OVERRIDE;

124 virtual bool SetFocus() OVERRIDE;	123 virtual bool SetFocus() OVERRIDE;

125 virtual View* GetView() OVERRIDE;	124 virtual View* GetView() OVERRIDE;

126 virtual gfx::NativeView GetTestingHandle() const OVERRIDE;	125 virtual gfx::NativeView GetTestingHandle() const OVERRIDE;

127 virtual bool IsIMEComposing() const OVERRIDE;	126 virtual bool IsIMEComposing() const OVERRIDE;

128 virtual gfx::Range GetSelectedRange() const OVERRIDE;	127 virtual gfx::Range GetSelectedRange() const OVERRIDE;

129 virtual void SelectRange(const gfx::Range& range) OVERRIDE;	128 virtual void SelectRange(const gfx::Range& range) OVERRIDE;

130 virtual gfx::SelectionModel GetSelectionModel() const OVERRIDE;	129 virtual gfx::SelectionModel GetSelectionModel() const OVERRIDE;

131 virtual void SelectSelectionModel(const gfx::SelectionModel& sel) OVERRIDE;	130 virtual void SelectSelectionModel(const gfx::SelectionModel& sel) OVERRIDE;

132 virtual size_t GetCursorPosition() const OVERRIDE;	131 virtual size_t GetCursorPosition() const OVERRIDE;

133 virtual bool GetCursorEnabled() const OVERRIDE;	132 virtual bool GetCursorEnabled() const OVERRIDE;

(...skipping 200 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
334 // obscured text. When the timer is running, the last typed char is shown	333 // obscured text. When the timer is running, the last typed char is shown

335 // and when the time expires, the last typed char is obscured.	334 // and when the time expires, the last typed char is obscured.

336 base::OneShotTimer<NativeTextfieldViews> obscured_reveal_timer_;	335 base::OneShotTimer<NativeTextfieldViews> obscured_reveal_timer_;

337	336

338 DISALLOW_COPY_AND_ASSIGN(NativeTextfieldViews);	337 DISALLOW_COPY_AND_ASSIGN(NativeTextfieldViews);

339 };	338 };

340	339

341 } // namespace views	340 } // namespace views

342	341

343 #endif // UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_	342 #endif // UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_

OLD	NEW