Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Side by Side Diff: chrome/browser/ui/tests/ui_gfx_image_unittest.cc

Issue 6849030: Add support for multi resolution icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added comments Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/memory/scoped_ptr.h" 5 #include "base/memory/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_util.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
(...skipping 16 matching lines...) Expand all
36 36
37 #if defined(OS_LINUX) 37 #if defined(OS_LINUX)
38 TEST(UiGfxImageTest, GtkImageView) { 38 TEST(UiGfxImageTest, GtkImageView) {
39 GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL); 39 GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
40 gtk_window_resize(GTK_WINDOW(window), 200, 200); 40 gtk_window_resize(GTK_WINDOW(window), 200, 200);
41 gtk_window_move(GTK_WINDOW(window), 300, 300); 41 gtk_window_move(GTK_WINDOW(window), 300, 300);
42 42
43 GtkWidget* fixed = gtk_fixed_new(); 43 GtkWidget* fixed = gtk_fixed_new();
44 gtk_container_add(GTK_CONTAINER(window), fixed); 44 gtk_container_add(GTK_CONTAINER(window), fixed);
45 45
46 gfx::Image image(gfx::test::CreateBitmap()); 46 gfx::Image image(gfx::test::CreateBitmap(25, 25));
47 GtkWidget* image_view = gtk_image_new_from_pixbuf(image); 47 GtkWidget* image_view = gtk_image_new_from_pixbuf(image);
48 gtk_fixed_put(GTK_FIXED(fixed), image_view, 10, 10); 48 gtk_fixed_put(GTK_FIXED(fixed), image_view, 10, 10);
49 gtk_widget_set_size_request(image_view, 25, 25); 49 gtk_widget_set_size_request(image_view, 25, 25);
50 50
51 gtk_widget_show_all(window); 51 gtk_widget_show_all(window);
52 52
53 gtk_widget_destroy(window); 53 gtk_widget_destroy(window);
54 } 54 }
55 #endif 55 #endif
56 56
57 } // namespace 57 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc ('k') | chrome/browser/ui/tests/ui_gfx_image_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698