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

Unified Diff: chrome/browser/ui/cocoa/image_button_cell_unittest.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: chrome/browser/ui/cocoa/image_button_cell_unittest.mm
diff --git a/chrome/browser/ui/cocoa/image_button_cell_unittest.mm b/chrome/browser/ui/cocoa/image_button_cell_unittest.mm
index bbe29210327ac5b6db0e0a2139cdde81b42de15b..84d1191e4899590f42b2dcbb680ea1298cf59bfa 100644
--- a/chrome/browser/ui/cocoa/image_button_cell_unittest.mm
+++ b/chrome/browser/ui/cocoa/image_button_cell_unittest.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
#import "chrome/browser/ui/cocoa/image_button_cell.h"
#include "grit/theme_resources.h"
@@ -13,9 +13,10 @@ class ImageButtonCellTest : public CocoaTest {
public:
ImageButtonCellTest() {
NSRect frame = NSMakeRect(0, 0, 50, 30);
- scoped_nsobject<NSButton>view([[NSButton alloc] initWithFrame:frame]);
+ base::scoped_nsobject<NSButton> view(
+ [[NSButton alloc] initWithFrame:frame]);
view_ = view.get();
- scoped_nsobject<ImageButtonCell> cell(
+ base::scoped_nsobject<ImageButtonCell> cell(
[[ImageButtonCell alloc] initTextCell:@""]);
[view_ setCell:cell.get()];
[[test_window() contentView] addSubview:view_];

Powered by Google App Engine
This is Rietveld 408576698