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

Unified Diff: chrome/browser/ui/cocoa/extensions/browser_action_button.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
Index: chrome/browser/ui/cocoa/extensions/browser_action_button.h
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.h b/chrome/browser/ui/cocoa/extensions/browser_action_button.h
index 7a083d3dbc4fee519874a464de1dddcc305316ba..fa5a46b074e427d380e1f01b7a0625ba62c0749b 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_action_button.h
+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.h
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#import "chrome/browser/ui/cocoa/image_button_cell.h"
@@ -31,7 +31,7 @@ extern NSString* const kBrowserActionButtonDragEndNotification;
scoped_ptr<ExtensionActionIconFactoryBridge> iconFactoryBridge_;
// Used to move the button and query whether a button is currently animating.
- scoped_nsobject<NSViewAnimation> moveAnimation_;
+ base::scoped_nsobject<NSViewAnimation> moveAnimation_;
// The extension for this button. Weak.
const extensions::Extension* extension_;

Powered by Google App Engine
This is Rietveld 408576698