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

Unified Diff: content/browser/web_contents/web_drag_dest_mac.mm

Issue 16415016: Move nullable_string16.h to the string subdirectory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moar 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/browser/web_contents/web_drag_dest_mac.mm
diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm
index b1dde1820a168023f32964d58b10c73b6880f31f..096c1398d7d321919c1c9573aaa44a073302f621 100644
--- a/content/browser/web_contents/web_drag_dest_mac.mm
+++ b/content/browser/web_contents/web_drag_dest_mac.mm
@@ -261,7 +261,7 @@ int GetModifierFlags() {
// Get plain text.
if ([types containsObject:NSStringPboardType]) {
- data->text = NullableString16(
+ data->text = base::NullableString16(
base::SysNSStringToUTF16([pboard stringForType:NSStringPboardType]),
false);
}
@@ -269,13 +269,13 @@ int GetModifierFlags() {
// Get HTML. If there's no HTML, try RTF.
if ([types containsObject:NSHTMLPboardType]) {
NSString* html = [pboard stringForType:NSHTMLPboardType];
- data->html = NullableString16(base::SysNSStringToUTF16(html), false);
+ data->html = base::NullableString16(base::SysNSStringToUTF16(html), false);
} else if ([types containsObject:ui::kChromeDragImageHTMLPboardType]) {
NSString* html = [pboard stringForType:ui::kChromeDragImageHTMLPboardType];
- data->html = NullableString16(base::SysNSStringToUTF16(html), false);
+ data->html = base::NullableString16(base::SysNSStringToUTF16(html), false);
} else if ([types containsObject:NSRTFPboardType]) {
NSString* html = [pboard htmlFromRtf];
- data->html = NullableString16(base::SysNSStringToUTF16(html), false);
+ data->html = base::NullableString16(base::SysNSStringToUTF16(html), false);
}
// Get files.
« no previous file with comments | « content/browser/web_contents/web_drag_dest_gtk.cc ('k') | content/browser/web_contents/web_drag_dest_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698