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

Unified Diff: content/common/mac/attributed_string_coder.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: content/common/mac/attributed_string_coder.mm
diff --git a/content/common/mac/attributed_string_coder.mm b/content/common/mac/attributed_string_coder.mm
index 37af9de85c17767aaefd638e778733edcd352787..2f32ec30e8fb2cbc50d3c5f035f6414714e70438 100644
--- a/content/common/mac/attributed_string_coder.mm
+++ b/content/common/mac/attributed_string_coder.mm
@@ -7,7 +7,7 @@
#include <AppKit/AppKit.h>
#include "base/logging.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "content/common/view_messages.h"
@@ -45,7 +45,7 @@ NSAttributedString* AttributedStringCoder::Decode(
const AttributedStringCoder::EncodedString* str) {
// Create the return value.
NSString* plain_text = base::SysUTF16ToNSString(str->string());
- scoped_nsobject<NSMutableAttributedString> decoded_string(
+ base::scoped_nsobject<NSMutableAttributedString> decoded_string(
[[NSMutableAttributedString alloc] initWithString:plain_text]);
// Iterate over all the encoded attributes, attaching each to the string.
const std::vector<FontAttribute> attributes = str->attributes();

Powered by Google App Engine
This is Rietveld 408576698