| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/scoped_ptr.h" | 5 #include "base/scoped_ptr.h" |
| 6 #include "testing/gtest/include/gtest/gtest.h" | 6 #include "testing/gtest/include/gtest/gtest.h" |
| 7 #include "third_party/skia/include/core/SkBitmap.h" | 7 #include "third_party/skia/include/core/SkBitmap.h" |
| 8 #include "ui/gfx/image.h" | 8 #include "ui/gfx/image.h" |
| 9 #include "ui/gfx/image_unittest.h" | 9 #include "ui/gfx/image_unittest.h" |
| 10 | 10 |
| 11 #if defined(OS_LINUX) | 11 #if defined(OS_LINUX) |
| 12 #include <gtk/gtk.h> | 12 #include <gtk/gtk.h> |
| 13 #include "ui/gfx/gtk_util.h" | 13 #include "ui/gfx/gtk_util.h" |
| 14 #endif | 14 #endif |
| 15 | 15 |
| 16 #if defined(TOOLKIT_VIEWS) | 16 #if defined(TOOLKIT_VIEWS) |
| 17 #include "views/controls/image_view.h" | 17 #include "views/controls/image_view.h" |
| 18 #include "views/view.h" | 18 #include "views/view.h" |
| 19 #endif | 19 #endif |
| 20 | 20 |
| 21 namespace { | 21 namespace { |
| 22 | 22 |
| 23 using namespace ui::gfx::test; | 23 using namespace gfx::test; |
| 24 | 24 |
| 25 #if defined(TOOLKIT_VIEWS) | 25 #if defined(TOOLKIT_VIEWS) |
| 26 TEST(UiGfxImageTest, ViewsImageView) { | 26 TEST(UiGfxImageTest, ViewsImageView) { |
| 27 ui::gfx::Image image(CreatePlatformImage()); | 27 gfx::Image image(CreatePlatformImage()); |
| 28 | 28 |
| 29 scoped_ptr<views::View> container(new views::View()); | 29 scoped_ptr<views::View> container(new views::View()); |
| 30 container->SetBounds(0, 0, 200, 200); | 30 container->SetBounds(0, 0, 200, 200); |
| 31 container->SetVisible(true); | 31 container->SetVisible(true); |
| 32 | 32 |
| 33 scoped_ptr<views::ImageView> image_view(new views::ImageView()); | 33 scoped_ptr<views::ImageView> image_view(new views::ImageView()); |
| 34 image_view->SetImage(image); | 34 image_view->SetImage(image); |
| 35 container->AddChildView(image_view.get()); | 35 container->AddChildView(image_view.get()); |
| 36 } | 36 } |
| 37 #endif | 37 #endif |
| 38 | 38 |
| 39 #if defined(OS_LINUX) | 39 #if defined(OS_LINUX) |
| 40 TEST(UiGfxImageTest, GtkImageView) { | 40 TEST(UiGfxImageTest, GtkImageView) { |
| 41 GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL); | 41 GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL); |
| 42 gtk_window_resize(GTK_WINDOW(window), 200, 200); | 42 gtk_window_resize(GTK_WINDOW(window), 200, 200); |
| 43 gtk_window_move(GTK_WINDOW(window), 300, 300); | 43 gtk_window_move(GTK_WINDOW(window), 300, 300); |
| 44 | 44 |
| 45 GtkWidget* fixed = gtk_fixed_new(); | 45 GtkWidget* fixed = gtk_fixed_new(); |
| 46 gtk_container_add(GTK_CONTAINER(window), fixed); | 46 gtk_container_add(GTK_CONTAINER(window), fixed); |
| 47 | 47 |
| 48 ui::gfx::Image image(CreateBitmap()); | 48 gfx::Image image(CreateBitmap()); |
| 49 GtkWidget* image_view = gtk_image_new_from_pixbuf(image); | 49 GtkWidget* image_view = gtk_image_new_from_pixbuf(image); |
| 50 gtk_fixed_put(GTK_FIXED(fixed), image_view, 10, 10); | 50 gtk_fixed_put(GTK_FIXED(fixed), image_view, 10, 10); |
| 51 gtk_widget_set_size_request(image_view, 25, 25); | 51 gtk_widget_set_size_request(image_view, 25, 25); |
| 52 | 52 |
| 53 gtk_widget_show_all(window); | 53 gtk_widget_show_all(window); |
| 54 | 54 |
| 55 gtk_widget_destroy(window); | 55 gtk_widget_destroy(window); |
| 56 } | 56 } |
| 57 #endif | 57 #endif |
| 58 | 58 |
| 59 } // namespace | 59 } // namespace |
| OLD | NEW |