summaryrefslogtreecommitdiffstats
path: root/ui/views/examples
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 17:32:42 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 17:32:42 +0000
commit4ddae4b52b381c1786c6e8608f50663e8c89ad6f (patch)
treebad24ee6acd22396bacd03098988f689c8e58e6a /ui/views/examples
parentce0e05cc1caaf208488c954d2e715f73673ad89b (diff)
downloadchromium_src-4ddae4b52b381c1786c6e8608f50663e8c89ad6f.zip
chromium_src-4ddae4b52b381c1786c6e8608f50663e8c89ad6f.tar.gz
chromium_src-4ddae4b52b381c1786c6e8608f50663e8c89ad6f.tar.bz2
ui/gfx: Rename almost all entries from gfx::CanvasSkia to gfx::Canvas.
BUG=116572 R=asvitkine@chromium.org TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/9705063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126935 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/examples')
-rw-r--r--ui/views/examples/text_example.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc
index 0da14ec..3ffb589 100644
--- a/ui/views/examples/text_example.cc
+++ b/ui/views/examples/text_example.cc
@@ -96,7 +96,7 @@ class TextExample::TextExampleView : public View {
text_flags_(0),
halo_(false),
fade_(false),
- fade_mode_(gfx::CanvasSkia::TruncateFadeTail) {
+ fade_mode_(gfx::Canvas::TruncateFadeTail) {
}
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
@@ -132,8 +132,8 @@ class TextExample::TextExampleView : public View {
bool fade() const { return fade_; }
void set_fade(bool fade) { fade_ = fade; }
- gfx::CanvasSkia::TruncateFadeMode fade_mode() const { return fade_mode_; }
- void set_fade_mode(gfx::CanvasSkia::TruncateFadeMode fade_mode) {
+ gfx::Canvas::TruncateFadeMode fade_mode() const { return fade_mode_; }
+ void set_fade_mode(gfx::Canvas::TruncateFadeMode fade_mode) {
fade_mode_ = fade_mode;
}
@@ -163,7 +163,7 @@ class TextExample::TextExampleView : public View {
bool fade_;
// If |fade_| is |true|, fade mode parameter to |DrawFadeTruncatingString()|.
- gfx::CanvasSkia::TruncateFadeMode fade_mode_;
+ gfx::Canvas::TruncateFadeMode fade_mode_;
DISALLOW_COPY_AND_ASSIGN(TextExampleView);
};
@@ -338,15 +338,15 @@ void TextExample::ItemChanged(Combobox* combo_box,
break;
#if defined(OS_WIN)
case 2:
- text_view_->set_fade_mode(gfx::CanvasSkia::TruncateFadeTail);
+ text_view_->set_fade_mode(gfx::Canvas::TruncateFadeTail);
text_view_->set_fade(true);
break;
case 3:
- text_view_->set_fade_mode(gfx::CanvasSkia::TruncateFadeHead);
+ text_view_->set_fade_mode(gfx::Canvas::TruncateFadeHead);
text_view_->set_fade(true);
break;
case 4:
- text_view_->set_fade_mode(gfx::CanvasSkia::TruncateFadeHeadAndTail);
+ text_view_->set_fade_mode(gfx::Canvas::TruncateFadeHeadAndTail);
text_view_->set_fade(true);
break;
#endif