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

Unified Diff: ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm

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: 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];
}

Powered by Google App Engine
This is Rietveld 408576698