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

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

Issue 11362070: Remove unused custom vertical text alignment in CanvasSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and rebase. Created 8 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
« no previous file with comments | « ui/views/controls/menu/menu_item_view_win.cc ('k') | ui/views/examples/text_example.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_vector.h" 10 #include "base/memory/scoped_vector.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 // Overridden from ComboboxListener: 46 // Overridden from ComboboxListener:
47 virtual void OnSelectedIndexChanged(Combobox* combobox) OVERRIDE; 47 virtual void OnSelectedIndexChanged(Combobox* combobox) OVERRIDE;
48 48
49 class TextExampleView; 49 class TextExampleView;
50 // The content of the scroll view. 50 // The content of the scroll view.
51 TextExampleView* text_view_; 51 TextExampleView* text_view_;
52 52
53 // Combo box for horizontal text alignment. 53 // Combo box for horizontal text alignment.
54 Combobox* h_align_cb_; 54 Combobox* h_align_cb_;
55 55
56 // Combo box for vertical text alignment.
57 Combobox* v_align_cb_;
58
59 // Combo box for text eliding style. 56 // Combo box for text eliding style.
60 Combobox* eliding_cb_; 57 Combobox* eliding_cb_;
61 58
62 // Combo box for ampersand prefix show / hide behavior. 59 // Combo box for ampersand prefix show / hide behavior.
63 Combobox* prefix_cb_; 60 Combobox* prefix_cb_;
64 61
65 // Combo box to choose one of the sample texts. 62 // Combo box to choose one of the sample texts.
66 Combobox* text_cb_; 63 Combobox* text_cb_;
67 64
68 // Check box to enable/disable multiline text drawing. 65 // Check box to enable/disable multiline text drawing.
(...skipping 18 matching lines...) Expand all
87 // around until destruction time. 84 // around until destruction time.
88 ScopedVector<ExampleComboboxModel> example_combobox_model_; 85 ScopedVector<ExampleComboboxModel> example_combobox_model_;
89 86
90 DISALLOW_COPY_AND_ASSIGN(TextExample); 87 DISALLOW_COPY_AND_ASSIGN(TextExample);
91 }; 88 };
92 89
93 } // namespace examples 90 } // namespace examples
94 } // namespace views 91 } // namespace views
95 92
96 #endif // UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_ 93 #endif // UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_item_view_win.cc ('k') | ui/views/examples/text_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698