diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-22 19:31:26 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-22 19:31:26 +0000 |
| commit | 17437dba596f54bbafe2814a2c70552e7396aa4a (patch) | |
| tree | 90dd8b904c57df38d093d527eb80f0427d581a8a /chrome/browser/ui/tests | |
| parent | 95d99c5d933de6eabd30aa22f5d20c7de43cb11e (diff) | |
| download | chromium_src-17437dba596f54bbafe2814a2c70552e7396aa4a.zip chromium_src-17437dba596f54bbafe2814a2c70552e7396aa4a.tar.gz chromium_src-17437dba596f54bbafe2814a2c70552e7396aa4a.tar.bz2 | |
Use large icon resource pak
This is a part of r82185 that was reverted. The change was reverted because it caused a performance regression.
In r82538 and r82584 I re-checked in code to split high-res icons into a seperate resource pak and load it.
This change adds code to actually use use the high-res icons.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6897013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/tests')
| -rw-r--r-- | chrome/browser/ui/tests/ui_gfx_image_unittest.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/tests/ui_gfx_image_unittest.mm | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc index cfe1c9b..7c8f100 100644 --- a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc +++ b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc @@ -6,7 +6,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/image.h" -#include "ui/gfx/image_unittest.h" +#include "ui/gfx/image_unittest_util.h" #if defined(OS_LINUX) #include <gtk/gtk.h> @@ -43,7 +43,7 @@ TEST(UiGfxImageTest, GtkImageView) { GtkWidget* fixed = gtk_fixed_new(); gtk_container_add(GTK_CONTAINER(window), fixed); - gfx::Image image(gfx::test::CreateBitmap()); + gfx::Image image(gfx::test::CreateBitmap(25, 25)); 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 9f62332..7245ff1 100644 --- a/chrome/browser/ui/tests/ui_gfx_image_unittest.mm +++ b/chrome/browser/ui/tests/ui_gfx_image_unittest.mm @@ -9,7 +9,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/image.h" -#include "ui/gfx/image_unittest.h" +#include "ui/gfx/image_unittest_util.h" namespace { @@ -17,7 +17,7 @@ class UiGfxImageTest : public CocoaTest { }; TEST_F(UiGfxImageTest, CheckColor) { - gfx::Image image(gfx::test::CreateBitmap()); + gfx::Image image(gfx::test::CreateBitmap(25, 25)); [image lockFocus]; NSColor* color = NSReadPixel(NSMakePoint(10, 10)); [image unlockFocus]; @@ -42,7 +42,7 @@ TEST_F(UiGfxImageTest, ImageView) { [[test_window() contentView] addSubview:image_view]; [test_window() orderFront:nil]; - gfx::Image image(gfx::test::CreateBitmap()); + gfx::Image image(gfx::test::CreateBitmap(25, 25)); [image_view setImage:image]; } |