diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-17 17:24:07 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-17 17:24:07 +0000 |
| commit | 06ec9a2deb3279897b693106839954f0798ef693 (patch) | |
| tree | 7a65401a55f122958a9960b6ca0a7454f6b1080f /chrome/browser/ui/tests | |
| parent | f060be3754a92a80e2f4402bde51763663f444d9 (diff) | |
| download | chromium_src-06ec9a2deb3279897b693106839954f0798ef693.zip chromium_src-06ec9a2deb3279897b693106839954f0798ef693.tar.gz chromium_src-06ec9a2deb3279897b693106839954f0798ef693.tar.bz2 | |
Move ui::gfx::Image out of the ui namespace to be just gfx::Image.
Having namespaces ui::gfx and just gfx are causing compiler disambiguation
problems. This will resolve that.
BUG=carnitas
TEST=compiles and gfx_unittests
Review URL: http://codereview.chromium.org/6533013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/tests')
| -rw-r--r-- | chrome/browser/ui/tests/ui_gfx_image_unittest.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/ui/tests/ui_gfx_image_unittest.mm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc index a8e8166..392a3bf 100644 --- a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc +++ b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc @@ -20,11 +20,11 @@ namespace { -using namespace ui::gfx::test; +using namespace gfx::test; #if defined(TOOLKIT_VIEWS) TEST(UiGfxImageTest, ViewsImageView) { - ui::gfx::Image image(CreatePlatformImage()); + gfx::Image image(CreatePlatformImage()); scoped_ptr<views::View> container(new views::View()); container->SetBounds(0, 0, 200, 200); @@ -45,7 +45,7 @@ TEST(UiGfxImageTest, GtkImageView) { GtkWidget* fixed = gtk_fixed_new(); gtk_container_add(GTK_CONTAINER(window), fixed); - ui::gfx::Image image(CreateBitmap()); + gfx::Image image(CreateBitmap()); GtkWidget* image_view = gtk_image_new_from_pixbuf(image); gtk_fixed_put(GTK_FIXED(fixed), image_view, 10, 10); gtk_widget_set_size_request(image_view, 25, 25); diff --git a/chrome/browser/ui/tests/ui_gfx_image_unittest.mm b/chrome/browser/ui/tests/ui_gfx_image_unittest.mm index c48e9bd..757ab26 100644 --- a/chrome/browser/ui/tests/ui_gfx_image_unittest.mm +++ b/chrome/browser/ui/tests/ui_gfx_image_unittest.mm @@ -13,13 +13,13 @@ namespace { -using namespace ui::gfx::test; +using namespace gfx::test; class UiGfxImageTest : public CocoaTest { }; TEST_F(UiGfxImageTest, CheckColor) { - ui::gfx::Image image(CreateBitmap()); + gfx::Image image(CreateBitmap()); [image lockFocus]; NSColor* color = NSReadPixel(NSMakePoint(10, 10)); [image unlockFocus]; @@ -44,7 +44,7 @@ TEST_F(UiGfxImageTest, ImageView) { [[test_window() contentView] addSubview:image_view]; [test_window() orderFront:nil]; - ui::gfx::Image image(CreateBitmap()); + gfx::Image image(CreateBitmap()); [image_view setImage:image]; } |