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

Unified Diff: ui/base/accelerators/platform_accelerator_cocoa.h

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/base/accelerators/platform_accelerator_cocoa.h
diff --git a/ui/base/accelerators/platform_accelerator_cocoa.h b/ui/base/accelerators/platform_accelerator_cocoa.h
index 5ac82610f70b38c56ef0d843768baec94aea5f2b..30941c77bb2651d6dfa13752807a3df0a7d6f7b2 100644
--- a/ui/base/accelerators/platform_accelerator_cocoa.h
+++ b/ui/base/accelerators/platform_accelerator_cocoa.h
@@ -7,7 +7,7 @@
#include <Foundation/Foundation.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "ui/base/accelerators/platform_accelerator.h"
namespace ui {
@@ -28,7 +28,7 @@ class UI_EXPORT PlatformAcceleratorCocoa : public PlatformAccelerator {
private:
// String of characters for the key equivalent.
- scoped_nsobject<NSString> characters_;
+ base::scoped_nsobject<NSString> characters_;
NSUInteger modifier_mask_;
DISALLOW_COPY_AND_ASSIGN(PlatformAcceleratorCocoa);

Powered by Google App Engine
This is Rietveld 408576698