| OLD | NEW | 
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> | 
| 6 | 6 | 
| 7 #include "base/mac/mac_util.h" | 7 #include "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" |  | 
| 10 #import "chrome/browser/ui/cocoa/sprite_view.h" | 9 #import "chrome/browser/ui/cocoa/sprite_view.h" | 
|  | 10 #import "chrome/browser/ui/cocoa/test/cocoa_test_helper.h" | 
| 11 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" | 
| 12 #include "testing/platform_test.h" | 12 #include "testing/platform_test.h" | 
| 13 #include "ui/base/resource/resource_bundle.h" | 13 #include "ui/base/resource/resource_bundle.h" | 
| 14 #include "ui/gfx/image/image.h" | 14 #include "ui/gfx/image/image.h" | 
| 15 #include "ui/resources/grit/ui_resources.h" | 15 #include "ui/resources/grit/ui_resources.h" | 
| 16 | 16 | 
| 17 @interface SpriteView (ExposedForTesting) | 17 @interface SpriteView (ExposedForTesting) | 
| 18 | 18 | 
| 19 - (BOOL)isAnimating; | 19 - (BOOL)isAnimating; | 
| 20 | 20 | 
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 73   EXPECT_TRUE([view_ isAnimating]); | 73   EXPECT_TRUE([view_ isAnimating]); | 
| 74 | 74 | 
| 75   [view_ removeFromSuperview]; | 75   [view_ removeFromSuperview]; | 
| 76   EXPECT_FALSE([view_ isAnimating]); | 76   EXPECT_FALSE([view_ isAnimating]); | 
| 77 | 77 | 
| 78   [[test_window() contentView] addSubview:view_]; | 78   [[test_window() contentView] addSubview:view_]; | 
| 79   EXPECT_TRUE([view_ isAnimating]); | 79   EXPECT_TRUE([view_ isAnimating]); | 
| 80 } | 80 } | 
| 81 | 81 | 
| 82 }  // namespace | 82 }  // namespace | 
| OLD | NEW | 
|---|