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

Unified Diff: ui/app_list/cocoa/apps_grid_controller.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/apps_grid_controller.mm
diff --git a/ui/app_list/cocoa/apps_grid_controller.mm b/ui/app_list/cocoa/apps_grid_controller.mm
index 6d556426f49372960da6670c6ff969c9c77cf568..200e853599d011397c15e45ad5d1582b6f5a1b15 100644
--- a/ui/app_list/cocoa/apps_grid_controller.mm
+++ b/ui/app_list/cocoa/apps_grid_controller.mm
@@ -340,12 +340,12 @@ class AppsGridDelegateBridge : public ui::ListModelObserver {
}
- (void)loadAndSetView {
- scoped_nsobject<PageContainerView> pagesContainer(
+ base::scoped_nsobject<PageContainerView> pagesContainer(
[[PageContainerView alloc] initWithFrame:NSZeroRect]);
NSRect scrollFrame = NSMakeRect(0, kGridTopPadding, kViewWidth,
kViewHeight + kScrollerPadding);
- scoped_nsobject<ScrollViewWithNoScrollbars> scrollView(
+ base::scoped_nsobject<ScrollViewWithNoScrollbars> scrollView(
[[ScrollViewWithNoScrollbars alloc] initWithFrame:scrollFrame]);
[scrollView setBorderType:NSNoBorder];
[scrollView setLineScroll:kViewWidth];
@@ -499,7 +499,8 @@ class AppsGridDelegateBridge : public ui::ListModelObserver {
- (void)moveItemInView:(size_t)fromIndex
toItemIndex:(size_t)toIndex {
- scoped_nsobject<NSValue> item([[items_ objectAtIndex:fromIndex] retain]);
+ base::scoped_nsobject<NSValue> item(
+ [[items_ objectAtIndex:fromIndex] retain]);
[items_ removeObjectAtIndex:fromIndex];
[items_ insertObject:item
atIndex:toIndex];

Powered by Google App Engine
This is Rietveld 408576698