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

Unified Diff: chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.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/find_bar/find_bar_cocoa_controller.h
diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h
index e5c482bebf969a6957bdd96b043516a37719886b..4c5a01885c0517944797d62a8075644a184b59b0 100644
--- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h
@@ -4,7 +4,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/strings/string16.h"
#include "ui/gfx/point.h"
@@ -33,19 +33,19 @@ class FindNotificationDetails;
Browser* browser_;
- scoped_nsobject<FocusTracker> focusTracker_;
+ base::scoped_nsobject<FocusTracker> focusTracker_;
// The show/hide animation. This is defined to be non-nil if the
// animation is running, and is always nil otherwise. The
// FindBarCocoaController should not be deallocated while an animation is
// running (stopAnimation is currently called before the last tab in a
// window is removed).
- scoped_nsobject<NSViewAnimation> showHideAnimation_;
+ base::scoped_nsobject<NSViewAnimation> showHideAnimation_;
// The horizontal-moving animation, to avoid occluding find results. This
// is nil when the animation is not running, and is also stopped by
// stopAnimation.
- scoped_nsobject<NSViewAnimation> moveAnimation_;
+ base::scoped_nsobject<NSViewAnimation> moveAnimation_;
// If YES, do nothing as a result of find pasteboard update notifications.
BOOL suppressPboardUpdateActions_;

Powered by Google App Engine
This is Rietveld 408576698