| Index: chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.mm b/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.mm
|
| index 5c0862ecba3f60c75c47163b09b172fd4574666f..d65dc50b4c88a63ea2e09d55eba1710d99984a40 100644
|
| --- a/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.mm
|
| @@ -100,7 +100,7 @@ class ExtensionIconLoaderBridge : public extensions::IconImage::Observer {
|
| // Use an arbitrary height because it will reflect the size of the content.
|
| NSRect contentRect = NSMakeRect(0, 0, kBubbleMinWidth, 150);
|
| // Create an empty window into which content is placed.
|
| - scoped_nsobject<InfoBubbleWindow> window(
|
| + base::scoped_nsobject<InfoBubbleWindow> window(
|
| [[InfoBubbleWindow alloc] initWithContentRect:contentRect
|
| styleMask:NSBorderlessWindowMask
|
| backing:NSBackingStoreBuffered
|
| @@ -160,7 +160,7 @@ class ExtensionIconLoaderBridge : public extensions::IconImage::Observer {
|
| CGFloat yOffset = kVerticalPadding;
|
|
|
| // Keep track of a potential separator to resize it when we know the width.
|
| - scoped_nsobject<NSBox> separatorView;
|
| + base::scoped_nsobject<NSBox> separatorView;
|
|
|
| // Loop over the items in reverse, constructing the menu items.
|
| CGFloat width = kBubbleMinWidth;
|
| @@ -183,11 +183,10 @@ class ExtensionIconLoaderBridge : public extensions::IconImage::Observer {
|
| } else {
|
| // Create the item controller. Autorelease it because it will be owned
|
| // by the |items_| array.
|
| - scoped_nsobject<ActionBoxMenuItemController> itemController(
|
| - [[ActionBoxMenuItemController alloc]
|
| - initWithModelIndex:i
|
| - menuController:self
|
| - profile:profile_]);
|
| + base::scoped_nsobject<ActionBoxMenuItemController> itemController(
|
| + [[ActionBoxMenuItemController alloc] initWithModelIndex:i
|
| + menuController:self
|
| + profile:profile_]);
|
|
|
| // Adjust the name field to fit the string.
|
| [GTMUILocalizerAndLayoutTweaker sizeToFitView:[itemController nameField]];
|
|
|