mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 #include <map>
 
 #import "base/mac/cocoa_protocols.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_state.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #include "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
 #include "ui/base/window_open_disposition.h"
 
 @class BookmarkBarController;
@@ skipping 153 matching lines @@
   CGFloat initialWidth_;
 
   // BookmarkNodes have a 64bit id.  NSMenuItems have a 32bit tag used
   // to represent the bookmark node they refer to.  This map provides
   // a mapping from one to the other, so we can properly identify the
   // node from the item.  When adding items in, we start with seedId_.
   int32 seedId_;
   std::map<int32,int64> menuTagMap_;
 
   // Our bookmark buttons, ordered from L-->R.
-  scoped_nsobject<NSMutableArray> buttons_;
+  base::scoped_nsobject<NSMutableArray> buttons_;
 
   // The folder image so we can use one copy for all buttons
-  scoped_nsobject<NSImage> folderImage_;
+  base::scoped_nsobject<NSImage> folderImage_;
 
   // The default image, so we can use one copy for all buttons.
-  scoped_nsobject<NSImage> defaultImage_;
+  base::scoped_nsobject<NSImage> defaultImage_;
 
   // If the bar is disabled, we hide it and ignore show/hide commands.
   // Set when using fullscreen mode.
   BOOL barIsEnabled_;
 
   // Bridge from Chrome-style C++ notifications (e.g. derived from
   // BookmarkModelObserver)
   scoped_ptr<BookmarkBarBridge> bridge_;
 
   // Delegate that is informed about state changes in the bookmark bar.
   id<BookmarkBarControllerDelegate> delegate_;  // weak
 
   // Delegate that can resize us.
   id<ViewResizer> resizeDelegate_;  // weak
 
   // Logic for dealing with a click on a bookmark folder button.
-  scoped_nsobject<BookmarkFolderTarget> folderTarget_;
+  base::scoped_nsobject<BookmarkFolderTarget> folderTarget_;
 
   // A controller for a pop-up bookmark folder window (custom menu).
   // This is not a scoped_nsobject because it owns itself (when its
   // window closes the controller gets autoreleased).
   BookmarkBarFolderController* folderController_;
 
   // The event tap that allows monitoring of all events, to properly close with
   // a click outside the bounds of the window.
   id exitEventTap_;
 
   IBOutlet BookmarkBarView* buttonView_;  // Contains 'no items' text fields.
   IBOutlet BookmarkButton* offTheSideButton_;  // aka the chevron.
 
   NSRect originalNoItemsRect_;  // Original, pre-resized field rect.
   NSRect originalImportBookmarksRect_;  // Original, pre-resized field rect.
 
   // "Other bookmarks" button on the right side.
-  scoped_nsobject<BookmarkButton> otherBookmarksButton_;
+  base::scoped_nsobject<BookmarkButton> otherBookmarksButton_;
 
   // "Apps" button to the right of "Other bookmarks".
-  scoped_nsobject<BookmarkButton> appsPageShortcutButton_;
+  base::scoped_nsobject<BookmarkButton> appsPageShortcutButton_;
 
   // When doing a drag, this is folder button "hovered over" which we
   // may want to open after a short delay.  There are cases where a
   // mouse-enter can open a folder (e.g. if the menus are "active")
   // but that doesn't use this variable or need a delay so "hover" is
   // the wrong term.
-  scoped_nsobject<BookmarkButton> hoverButton_;
+  base::scoped_nsobject<BookmarkButton> hoverButton_;
 
   // We save the view width when we add bookmark buttons.  This lets
   // us avoid a rebuild until we've grown the window bigger than our
   // initial build.
   CGFloat savedFrameWidth_;
 
   // The number of buttons we display in the bookmark bar.  This does
   // not include the "off the side" chevron or the "Other Bookmarks"
   // button.  We use this number to determine if we need to display
   // the chevron, and to know what to place in the chevron's menu.
@@ skipping 18 matching lines @@
   BOOL innerContentAnimationsEnabled_;
 
   // YES if there is a possible drop about to happen in the bar.
   BOOL hasInsertionPos_;
 
   // The x point on the bar where the left edge of the new item will end
   // up if it is dropped.
   CGFloat insertionPos_;
 
   // Controller responsible for all bookmark context menus.
-  scoped_nsobject<BookmarkContextMenuCocoaController> contextMenuController_;
+  base::scoped_nsobject<BookmarkContextMenuCocoaController>
+      contextMenuController_;
 }
 
 @property(readonly, nonatomic) BookmarkBar::State currentState;
 @property(readonly, nonatomic) BookmarkBar::State lastState;
 @property(readonly, nonatomic) BOOL isAnimationRunning;
 @property(assign, nonatomic) id<BookmarkBarControllerDelegate> delegate;
 @property(assign, nonatomic) BOOL stateAnimationsEnabled;
 @property(assign, nonatomic) BOOL innerContentAnimationsEnabled;
 
 // Initializes the bookmark bar controller with the given browser
@@ skipping 119 matching lines @@
 - (BookmarkButton*)buttonForDroppingOnAtPoint:(NSPoint)point;
 - (BOOL)isEventAnExitEvent:(NSEvent*)event;
 - (BOOL)shrinkOrHideView:(NSView*)view forMaxX:(CGFloat)maxViewX;
 - (void)unhighlightBookmark:(const BookmarkNode*)node;
 
 // The following are for testing purposes only and are not used internally.
 - (NSMenu *)menuForFolderNode:(const BookmarkNode*)node;
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_