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

Unified Diff: ui/base/cocoa/hover_image_button_unittest.mm

Issue 12937008: Move HoverButton and HoverImageButton from chrome/browser/ui/cocoa/ to ui/base/cocoa. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: '' Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/cocoa/hover_image_button.mm ('k') | ui/ui.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/cocoa/hover_image_button_unittest.mm
diff --git a/chrome/browser/ui/cocoa/hover_image_button_unittest.mm b/ui/base/cocoa/hover_image_button_unittest.mm
similarity index 66%
rename from chrome/browser/ui/cocoa/hover_image_button_unittest.mm
rename to ui/base/cocoa/hover_image_button_unittest.mm
index 7702c5c703ca74d87c953a2fe50ada0e6b59198a..c283b10be57b673af6085c5e7d395571749046f1 100644
--- a/chrome/browser/ui/cocoa/hover_image_button_unittest.mm
+++ b/ui/base/cocoa/hover_image_button_unittest.mm
@@ -2,19 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#import <Cocoa/Cocoa.h>
+#import "ui/base/cocoa/hover_image_button.h"
-#include "base/memory/scoped_nsobject.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/hover_image_button.h"
-#include "grit/theme_resources.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/image/image.h"
+#import "base/memory/scoped_nsobject.h"
+#import "ui/base/test/ui_cocoa_test_helper.h"
namespace {
-class HoverImageButtonTest : public CocoaTest {
+class HoverImageButtonTest : public ui::CocoaTest {
public:
HoverImageButtonTest() {
NSRect content_frame = [[test_window() contentView] frame];
@@ -35,9 +30,8 @@ class HoverImageButtonTest : public CocoaTest {
// Test mouse events.
TEST_F(HoverImageButtonTest, ImageSwap) {
- ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- NSImage* image = rb.GetNativeImageNamed(IDR_HOME).ToNSImage();
- NSImage* hover = rb.GetNativeImageNamed(IDR_BACK).ToNSImage();
+ NSImage* image = [NSImage imageNamed:NSImageNameStatusAvailable];
+ NSImage* hover = [NSImage imageNamed:NSImageNameStatusNone];
[button_ setDefaultImage:image];
[button_ setHoverImage:hover];
@@ -52,8 +46,7 @@ TEST_F(HoverImageButtonTest, ImageSwap) {
// Test mouse events.
TEST_F(HoverImageButtonTest, Opacity) {
- ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- NSImage* image = rb.GetNativeImageNamed(IDR_HOME).ToNSImage();
+ NSImage* image = [NSImage imageNamed:NSImageNameStatusAvailable];
[button_ setDefaultImage:image];
[button_ setDefaultOpacity:0.5];
[button_ setHoverImage:image];
« no previous file with comments | « ui/base/cocoa/hover_image_button.mm ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698