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

Side by Side Diff: ui/views/examples/text_example.h

Issue 1013543006: [RenderText] Adding vertical alignment options (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed pixel tests on vertical alignment Created 5 years, 8 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
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_EXAMPLES_TEXT_EXAMPLE_H_ 5 #ifndef UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_
6 #define UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_ 6 #define UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "ui/views/controls/button/button.h" 10 #include "ui/views/controls/button/button.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 // ComboboxListener: 45 // ComboboxListener:
46 void OnPerformAction(Combobox* combobox) override; 46 void OnPerformAction(Combobox* combobox) override;
47 47
48 class TextExampleView; 48 class TextExampleView;
49 // The content of the scroll view. 49 // The content of the scroll view.
50 TextExampleView* text_view_; 50 TextExampleView* text_view_;
51 51
52 // Combo box for horizontal text alignment. 52 // Combo box for horizontal text alignment.
53 Combobox* h_align_cb_; 53 Combobox* h_align_cb_;
54 54
55 // Combo box for vertical text alignment.
56 Combobox* v_align_cb_;
57
55 // Combo box for text eliding style. 58 // Combo box for text eliding style.
56 Combobox* eliding_cb_; 59 Combobox* eliding_cb_;
57 60
58 // Combo box for ampersand prefix show / hide behavior. 61 // Combo box for ampersand prefix show / hide behavior.
59 Combobox* prefix_cb_; 62 Combobox* prefix_cb_;
60 63
61 // Combo box to choose one of the sample texts. 64 // Combo box to choose one of the sample texts.
62 Combobox* text_cb_; 65 Combobox* text_cb_;
63 66
64 // Check box to enable/disable multiline text drawing. 67 // Check box to enable/disable multiline text drawing.
(...skipping 18 matching lines...) Expand all
83 // around until destruction time. 86 // around until destruction time.
84 ScopedVector<ExampleComboboxModel> example_combobox_model_; 87 ScopedVector<ExampleComboboxModel> example_combobox_model_;
85 88
86 DISALLOW_COPY_AND_ASSIGN(TextExample); 89 DISALLOW_COPY_AND_ASSIGN(TextExample);
87 }; 90 };
88 91
89 } // namespace examples 92 } // namespace examples
90 } // namespace views 93 } // namespace views
91 94
92 #endif // UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_ 95 #endif // UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698