| OLD | NEW | 
|---|
| 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/mac/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/test/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 }; | 
| 19 | 19 | 
| (...skipping 28 matching lines...) Expand all  Loading... | 
| 48       [[NSImageView alloc] initWithFrame:NSMakeRect(10, 10, 25, 25)]); | 48       [[NSImageView alloc] initWithFrame:NSMakeRect(10, 10, 25, 25)]); | 
| 49   [[test_window() contentView] addSubview:image_view]; | 49   [[test_window() contentView] addSubview:image_view]; | 
| 50   [test_window() orderFront:nil]; | 50   [test_window() orderFront:nil]; | 
| 51 | 51 | 
| 52   gfx::Image image = gfx::Image::CreateFrom1xBitmap( | 52   gfx::Image image = gfx::Image::CreateFrom1xBitmap( | 
| 53       gfx::test::CreateBitmap(25, 25)); | 53       gfx::test::CreateBitmap(25, 25)); | 
| 54   [image_view setImage:image.ToNSImage()]; | 54   [image_view setImage:image.ToNSImage()]; | 
| 55 } | 55 } | 
| 56 | 56 | 
| 57 }  // namespace | 57 }  // namespace | 
| OLD | NEW | 
|---|