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

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

Issue 23228004: Prepare to use gfx::RenderText in views::Label. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert Label implementation changes. Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/examples/label_example.cc ('k') | ui/views/examples/multiline_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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_EXAMPLES_MULTILINE_EXAMPLE_H_ 5 #ifndef UI_VIEWS_EXAMPLES_MULTILINE_EXAMPLE_H_
6 #define UI_VIEWS_EXAMPLES_MULTILINE_EXAMPLE_H_ 6 #define UI_VIEWS_EXAMPLES_MULTILINE_EXAMPLE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/views/controls/button/button.h" 9 #include "ui/views/controls/button/button.h"
10 #include "ui/views/controls/textfield/textfield_controller.h" 10 #include "ui/views/controls/textfield/textfield_controller.h"
(...skipping 19 matching lines...) Expand all
30 30
31 // ButtonListener: 31 // ButtonListener:
32 virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; 32 virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
33 33
34 private: 34 private:
35 class RenderTextView; 35 class RenderTextView;
36 36
37 // TextfieldController: 37 // TextfieldController:
38 virtual void ContentsChanged(Textfield* sender, 38 virtual void ContentsChanged(Textfield* sender,
39 const base::string16& new_contents) OVERRIDE; 39 const base::string16& new_contents) OVERRIDE;
40 virtual bool HandleKeyEvent(Textfield* sender,
41 const ui::KeyEvent& key_event) OVERRIDE;
42 40
43 RenderTextView* render_text_view_; 41 RenderTextView* render_text_view_;
44 Label* label_; 42 Label* label_;
45 Textfield* textfield_; 43 Textfield* textfield_;
46 44
47 // Checkbox to enable and disable text rendering in |label_|. 45 // Checkbox to enable and disable text rendering in |label_|.
48 Checkbox* label_checkbox_; 46 Checkbox* label_checkbox_;
49 47
50 DISALLOW_COPY_AND_ASSIGN(MultilineExample); 48 DISALLOW_COPY_AND_ASSIGN(MultilineExample);
51 }; 49 };
52 50
53 } // namespace examples 51 } // namespace examples
54 } // namespace views 52 } // namespace views
55 53
56 #endif // UI_VIEWS_EXAMPLES_MULTILINE_EXAMPLE_H_ 54 #endif // UI_VIEWS_EXAMPLES_MULTILINE_EXAMPLE_H_
OLDNEW
« no previous file with comments | « ui/views/examples/label_example.cc ('k') | ui/views/examples/multiline_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698