diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 07:37:29 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 07:37:29 +0000 |
| commit | 82522511b7921e8c61742ebd80a4c674c56e7e48 (patch) | |
| tree | 381d71de2b9c7b99675e6f2b4523ae0876c72ce8 /views/controls/label_unittest.cc | |
| parent | 631cf822bd6e64cf469544b42c9975f5602c29a6 (diff) | |
| download | chromium_src-82522511b7921e8c61742ebd80a4c674c56e7e48.zip chromium_src-82522511b7921e8c61742ebd80a4c674c56e7e48.tar.gz chromium_src-82522511b7921e8c61742ebd80a4c674c56e7e48.tar.bz2 | |
ChromeCanvas->gfx::Canvas
Rename files too.
TBR=brettw
http://crbug.com/11387
Review URL: http://codereview.chromium.org/113443
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/label_unittest.cc')
| -rw-r--r-- | views/controls/label_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/views/controls/label_unittest.cc b/views/controls/label_unittest.cc index 54ee5ca..f9bb484 100644 --- a/views/controls/label_unittest.cc +++ b/views/controls/label_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/chrome_canvas.h" +#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "base/string_util.h" #include "testing/gtest/include/gtest/gtest.h" @@ -394,7 +394,7 @@ TEST(LabelTest, DrawMultiLineString) { EXPECT_EQ(0, text_bounds.y()); EXPECT_GT(text_bounds.width(), kMinTextDimension); EXPECT_GT(text_bounds.height(), kMinTextDimension); - EXPECT_EQ(ChromeCanvas::MULTI_LINE | ChromeCanvas::TEXT_ALIGN_CENTER, flags); + EXPECT_EQ(gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_CENTER, flags); gfx::Rect center_bounds(text_bounds); label.SetHorizontalAlignment(Label::ALIGN_LEFT); @@ -406,7 +406,7 @@ TEST(LabelTest, DrawMultiLineString) { EXPECT_EQ(0, text_bounds.y()); EXPECT_GT(text_bounds.width(), kMinTextDimension); EXPECT_GT(text_bounds.height(), kMinTextDimension); - EXPECT_EQ(ChromeCanvas::MULTI_LINE | ChromeCanvas::TEXT_ALIGN_LEFT, flags); + EXPECT_EQ(gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_LEFT, flags); label.SetHorizontalAlignment(Label::ALIGN_RIGHT); paint_text.clear(); @@ -417,7 +417,7 @@ TEST(LabelTest, DrawMultiLineString) { EXPECT_EQ(0, text_bounds.y()); EXPECT_GT(text_bounds.width(), kMinTextDimension); EXPECT_GT(text_bounds.height(), kMinTextDimension); - EXPECT_EQ(ChromeCanvas::MULTI_LINE | ChromeCanvas::TEXT_ALIGN_RIGHT, flags); + EXPECT_EQ(gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_RIGHT, flags); // Test multiline drawing with a border. gfx::Insets border(19, 92, 23, 2); @@ -435,7 +435,7 @@ TEST(LabelTest, DrawMultiLineString) { EXPECT_EQ(center_bounds.y() + border.top(), text_bounds.y()); EXPECT_EQ(center_bounds.width(), text_bounds.width()); EXPECT_EQ(center_bounds.height(), text_bounds.height()); - EXPECT_EQ(ChromeCanvas::MULTI_LINE | ChromeCanvas::TEXT_ALIGN_CENTER, flags); + EXPECT_EQ(gfx::Canvas::MULTI_LINE | gfx::Canvas::TEXT_ALIGN_CENTER, flags); } } // namespace views |