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

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

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #import <AppKit/AppKit.h> 5 #import <AppKit/AppKit.h>
6 6
7 #import "base/mac/mac_util.h" 7 #import "base/mac/mac_util.h"
8 #include "base/memory/scoped_nsobject.h" 8 #include "base/mac/scoped_nsobject.h"
9 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" 9 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
11 #include "third_party/skia/include/core/SkBitmap.h" 11 #include "third_party/skia/include/core/SkBitmap.h"
12 #include "ui/gfx/image/image.h" 12 #include "ui/gfx/image/image.h"
13 #include "ui/gfx/image/image_unittest_util.h" 13 #include "ui/gfx/image/image_unittest_util.h"
14 14
15 namespace { 15 namespace {
16 16
17 class UiGfxImageTest : public CocoaTest { 17 class UiGfxImageTest : public CocoaTest {
18 }; 18 };
(...skipping 19 matching lines...) Expand all
38 CGFloat components[4] = { 0 }; 38 CGFloat components[4] = { 0 };
39 [color getComponents:components]; 39 [color getComponents:components];
40 40
41 EXPECT_LT(components[0], 0.05); 41 EXPECT_LT(components[0], 0.05);
42 EXPECT_GT(components[1], 0.95); 42 EXPECT_GT(components[1], 0.95);
43 EXPECT_LT(components[2], 0.05); 43 EXPECT_LT(components[2], 0.05);
44 EXPECT_GT(components[3], 0.95); 44 EXPECT_GT(components[3], 0.95);
45 } 45 }
46 46
47 TEST_F(UiGfxImageTest, ImageView) { 47 TEST_F(UiGfxImageTest, ImageView) {
48 scoped_nsobject<NSImageView> image_view( 48 base::scoped_nsobject<NSImageView> image_view(
49 [[NSImageView alloc] initWithFrame:NSMakeRect(10, 10, 25, 25)]); 49 [[NSImageView alloc] initWithFrame:NSMakeRect(10, 10, 25, 25)]);
50 [[test_window() contentView] addSubview:image_view]; 50 [[test_window() contentView] addSubview:image_view];
51 [test_window() orderFront:nil]; 51 [test_window() orderFront:nil];
52 52
53 gfx::Image image = gfx::Image::CreateFrom1xBitmap( 53 gfx::Image image = gfx::Image::CreateFrom1xBitmap(
54 gfx::test::CreateBitmap(25, 25)); 54 gfx::test::CreateBitmap(25, 25));
55 [image_view setImage:image.ToNSImage()]; 55 [image_view setImage:image.ToNSImage()];
56 } 56 }
57 57
58 } // namespace 58 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698