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

Unified Diff: content/browser/web_contents/web_drag_dest_win.cc

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
« no previous file with comments | « content/browser/web_contents/web_drag_dest_mac.mm ('k') | content/child/indexed_db/indexed_db_dispatcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_drag_dest_win.cc
diff --git a/content/browser/web_contents/web_drag_dest_win.cc b/content/browser/web_contents/web_drag_dest_win.cc
index 2e1018326272d09c6c0b909cd552e8b0d5521ff6..4b02ab41a6631d6924f874420f8d7f2ebc9ca003 100644
--- a/content/browser/web_contents/web_drag_dest_win.cc
+++ b/content/browser/web_contents/web_drag_dest_win.cc
@@ -78,13 +78,13 @@ void PopulateWebDropData(IDataObject* data_object, WebDropData* drop_data) {
base::string16 text;
ui::ClipboardUtil::GetPlainText(data_object, &text);
if (!text.empty()) {
- drop_data->text = NullableString16(text, false);
+ drop_data->text = base::NullableString16(text, false);
}
base::string16 html;
std::string html_base_url;
ui::ClipboardUtil::GetHtml(data_object, &html, &html_base_url);
if (!html.empty()) {
- drop_data->html = NullableString16(html, false);
+ drop_data->html = base::NullableString16(html, false);
}
if (!html_base_url.empty()) {
drop_data->html_base_url = GURL(html_base_url);
« no previous file with comments | « content/browser/web_contents/web_drag_dest_mac.mm ('k') | content/child/indexed_db/indexed_db_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698