chrome/browser/ui/tests/ui_gfx_image_unittest.cc - Issue 8742030: views: Move view.h to ui/views/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 8742030: views: Move view.h to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase and fix conflicts Created 9 years 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

« no previous file with comments | « chrome/browser/instant/instant_controller.cc ('k') | chrome/browser/ui/views/about_chrome_view.h » ('j') | no next file with comments »

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/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/image.h"	8 #include "ui/gfx/image/image.h"

9 #include "ui/gfx/image/image_unittest_util.h"	9 #include "ui/gfx/image/image_unittest_util.h"

10	10

11 #if defined(TOOLKIT_USES_GTK)	11 #if defined(TOOLKIT_USES_GTK)

12 #include <gtk/gtk.h>	12 #include <gtk/gtk.h>

13	13

14 #include "ui/gfx/gtk_util.h"	14 #include "ui/gfx/gtk_util.h"

15 #endif	15 #endif

16	16

17 #if defined(TOOLKIT_VIEWS)	17 #if defined(TOOLKIT_VIEWS)

18 #include "ui/views/controls/image_view.h"	18 #include "ui/views/controls/image_view.h"

19 #include "views/view.h"	19 #include "ui/views/view.h"

20 #endif	20 #endif

21	21

22 namespace {	22 namespace {

23	23

24 #if defined(TOOLKIT_VIEWS)	24 #if defined(TOOLKIT_VIEWS)

25 TEST(UiGfxImageTest, ViewsImageView) {	25 TEST(UiGfxImageTest, ViewsImageView) {

26 gfx::Image image(gfx::test::CreatePlatformImage());	26 gfx::Image image(gfx::test::CreatePlatformImage());

27	27

28 scoped_ptr<views::View> container(new views::View());	28 scoped_ptr<views::View> container(new views::View());

29 container->SetBounds(0, 0, 200, 200);	29 container->SetBounds(0, 0, 200, 200);

(...skipping 19 matching lines...) Expand all Loading...
49 gtk_fixed_put(GTK_FIXED(fixed), image_view, 10, 10);	49 gtk_fixed_put(GTK_FIXED(fixed), image_view, 10, 10);

50 gtk_widget_set_size_request(image_view, 25, 25);	50 gtk_widget_set_size_request(image_view, 25, 25);

51	51

52 gtk_widget_show_all(window);	52 gtk_widget_show_all(window);

53	53

54 gtk_widget_destroy(window);	54 gtk_widget_destroy(window);

55 }	55 }

56 #endif	56 #endif

57	57

58 } // namespace	58 } // namespace

OLD	NEW