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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/animatable_view_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/animatable_view.h ('k') | chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h » ('j') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/animatable_view_unittest.mm
diff --git a/chrome/browser/ui/cocoa/animatable_view_unittest.mm b/chrome/browser/ui/cocoa/animatable_view_unittest.mm
index e59eae9932500a7e7539a5a477b6b37cf31a8216..1554ff5dbd40321fc393788862dd8b8fec041792 100644
--- a/chrome/browser/ui/cocoa/animatable_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/animatable_view_unittest.mm
@@ -4,7 +4,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#import "chrome/browser/ui/cocoa/animatable_view.h"
#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
#import "chrome/browser/ui/cocoa/view_resizer_pong.h"
@@ -24,8 +24,8 @@ class AnimatableViewTest : public CocoaTest {
[view_ setResizeDelegate:resizeDelegate_.get()];
}
- scoped_nsobject<ViewResizerPong> resizeDelegate_;
- scoped_nsobject<AnimatableView> view_;
+ base::scoped_nsobject<ViewResizerPong> resizeDelegate_;
+ base::scoped_nsobject<AnimatableView> view_;
};
// Basic view tests (AddRemove, Display).
« no previous file with comments | « chrome/browser/ui/cocoa/animatable_view.h ('k') | chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h » ('j') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698