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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/animatable_view.h

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_image.h ('k') | chrome/browser/ui/cocoa/animatable_view_unittest.mm » ('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.h
diff --git a/chrome/browser/ui/cocoa/animatable_view.h b/chrome/browser/ui/cocoa/animatable_view.h
index 91cae44a3f4672047ed2e79c24c68875d7470087..f84c2a58332e138419da33f0a6a028aaf3146542 100644
--- a/chrome/browser/ui/cocoa/animatable_view.h
+++ b/chrome/browser/ui/cocoa/animatable_view.h
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#import "chrome/browser/ui/cocoa/background_gradient_view.h"
#import "chrome/browser/ui/cocoa/view_resizer.h"
@@ -24,7 +24,7 @@
IBOutlet id delegate_; // weak, used to send animation ended messages.
@private
- scoped_nsobject<NSAnimation> currentAnimation_;
+ base::scoped_nsobject<NSAnimation> currentAnimation_;
id<ViewResizer> resizeDelegate_; // weak, usually owns us
}
« no previous file with comments | « chrome/browser/ui/cocoa/animatable_image.h ('k') | chrome/browser/ui/cocoa/animatable_view_unittest.mm » ('j') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698