| Index: ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm
|
| diff --git a/ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm b/ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm
|
| index 2057cfe622122526584ee2927660cbad0227cb0a..e20020909efb50bc41eace1941133df2a0d36a65 100644
|
| --- a/ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm
|
| +++ b/ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm
|
| @@ -5,7 +5,7 @@
|
| #include "ui/app_list/cocoa/scroll_view_with_no_scrollbars.h"
|
|
|
| #include "base/mac/mac_util.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
|
|
| #if !defined(MAC_OS_X_VERSION_10_7) || \
|
| MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
|
| @@ -52,7 +52,7 @@ typedef NSUInteger NSEventPhase;
|
| [self setHasHorizontalScroller:base::mac::IsOSLionOrLater()];
|
| NSRect horizontalScrollerRect = [self bounds];
|
| horizontalScrollerRect.size.height = 0;
|
| - scoped_nsobject<InvisibleScroller> horizontalScroller(
|
| + base::scoped_nsobject<InvisibleScroller> horizontalScroller(
|
| [[InvisibleScroller alloc] initWithFrame:horizontalScrollerRect]);
|
| [self setHorizontalScroller:horizontalScroller];
|
| }
|
|
|