| Index: chrome/browser/ui/cocoa/base_bubble_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/base_bubble_controller.mm b/chrome/browser/ui/cocoa/base_bubble_controller.mm
|
| index 91eaa9890c03689a240e4770ec0117b0f2b1ad36..c7ef5b6c7131b5d1ca5c65166482ddf38e7aeb1a 100644
|
| --- a/chrome/browser/ui/cocoa/base_bubble_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/base_bubble_controller.mm
|
| @@ -7,7 +7,7 @@
|
| #include "base/logging.h"
|
| #include "base/mac/bundle_locations.h"
|
| #include "base/mac/mac_util.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "base/strings/string_util.h"
|
| #import "chrome/browser/ui/cocoa/browser_window_controller.h"
|
| #import "chrome/browser/ui/cocoa/info_bubble_view.h"
|
| @@ -76,7 +76,7 @@
|
| DCHECK(![[self window] delegate]);
|
| [theWindow setDelegate:self];
|
|
|
| - scoped_nsobject<InfoBubbleView> contentView(
|
| + base::scoped_nsobject<InfoBubbleView> contentView(
|
| [[InfoBubbleView alloc] initWithFrame:NSMakeRect(0, 0, 0, 0)]);
|
| [theWindow setContentView:contentView.get()];
|
| bubble_ = contentView.get();
|
| @@ -123,7 +123,7 @@
|
|
|
| - (NSBox*)separatorWithFrame:(NSRect)frame {
|
| frame.size.height = 1.0;
|
| - scoped_nsobject<NSBox> spacer([[NSBox alloc] initWithFrame:frame]);
|
| + base::scoped_nsobject<NSBox> spacer([[NSBox alloc] initWithFrame:frame]);
|
| [spacer setBoxType:NSBoxSeparator];
|
| [spacer setBorderType:NSLineBorder];
|
| [spacer setAlphaValue:0.2];
|
|
|