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

Unified Diff: ui/views/examples/label_example.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/textfield/textfield.cc ('k') | ui/views/examples/multiline_example.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/label_example.cc
diff --git a/ui/views/examples/label_example.cc b/ui/views/examples/label_example.cc
index 0ffa7460d9c5fe6022c13452ca4e836519299988..178b62b69b4651bce404d2d9219d51f900006a1b 100644
--- a/ui/views/examples/label_example.cc
+++ b/ui/views/examples/label_example.cc
@@ -8,7 +8,6 @@
#include "ui/views/background.h"
#include "ui/views/border.h"
#include "ui/views/controls/button/checkbox.h"
-#include "ui/views/controls/button/label_button.h"
#include "ui/views/controls/combobox/combobox.h"
#include "ui/views/controls/label.h"
#include "ui/views/controls/textfield/textfield.h"
@@ -93,7 +92,7 @@ void LabelExample::CreateExampleView(View* container) {
gfx::ShadowValues shadows(1, gfx::ShadowValue(gfx::Point(), 1, SK_ColorRED));
gfx::ShadowValue shadow(gfx::Point(2, 2), 0, SK_ColorGRAY);
shadows.push_back(shadow);
- label->set_shadows(shadows);
+ label->SetShadows(shadows);
container->AddChildView(label);
label = new PreferredSizeLabel();
@@ -120,7 +119,7 @@ void LabelExample::ButtonPressed(Button* button, const ui::Event& event) {
shadows.push_back(gfx::ShadowValue(gfx::Point(), 1, SK_ColorRED));
shadows.push_back(gfx::ShadowValue(gfx::Point(2, 2), 0, SK_ColorGRAY));
}
- custom_label_->set_shadows(shadows);
+ custom_label_->SetShadows(shadows);
}
custom_label_->parent()->parent()->Layout();
custom_label_->SchedulePaint();
« no previous file with comments | « ui/views/controls/textfield/textfield.cc ('k') | ui/views/examples/multiline_example.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698