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

Unified Diff: ui/compositor/test/test_compositor_host_mac.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/compositor/test/test_compositor_host_mac.mm
diff --git a/ui/compositor/test/test_compositor_host_mac.mm b/ui/compositor/test/test_compositor_host_mac.mm
index 02c3ed63564123deb58df13f8dee1172280b014f..3debc020fd08b73b609f1d74621b52a44bb7ce81 100644
--- a/ui/compositor/test/test_compositor_host_mac.mm
+++ b/ui/compositor/test/test_compositor_host_mac.mm
@@ -11,7 +11,7 @@
#import <Foundation/NSAutoreleasePool.h>
#include "base/compiler_specific.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "ui/compositor/compositor.h"
#include "ui/gfx/rect.h"
@@ -126,7 +126,8 @@ void TestCompositorHostMac::Show() {
styleMask:NSBorderlessWindowMask
backing:NSBackingStoreBuffered
defer:NO];
- scoped_nsobject<AcceleratedTestView> view([[AcceleratedTestView alloc] init]);
+ base::scoped_nsobject<AcceleratedTestView> view(
+ [[AcceleratedTestView alloc] init]);
compositor_.reset(new ui::Compositor(this, view, bounds_.size()));
[view setCompositor:compositor_.get()];
[window_ setContentView:view];

Powered by Google App Engine
This is Rietveld 408576698