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

Side by Side Diff: content/browser/web_contents/web_drag_dest_gtk.cc

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/web_contents/web_drag_dest_gtk.h" 5 #include "content/browser/web_contents/web_drag_dest_gtk.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 for (gchar** uri_iter = uris; *uri_iter; uri_iter++) { 197 for (gchar** uri_iter = uris; *uri_iter; uri_iter++) {
198 // Most file managers populate text/uri-list with file URLs when 198 // Most file managers populate text/uri-list with file URLs when
199 // dragging files. To avoid exposing file system paths to web content, 199 // dragging files. To avoid exposing file system paths to web content,
200 // file URLs are never set as the URL content for the drop. 200 // file URLs are never set as the URL content for the drop.
201 // TODO(estade): Can the filenames have a non-UTF8 encoding? 201 // TODO(estade): Can the filenames have a non-UTF8 encoding?
202 GURL url(*uri_iter); 202 GURL url(*uri_iter);
203 base::FilePath file_path; 203 base::FilePath file_path;
204 if (url.SchemeIs(chrome::kFileScheme) && 204 if (url.SchemeIs(chrome::kFileScheme) &&
205 net::FileURLToFilePath(url, &file_path)) { 205 net::FileURLToFilePath(url, &file_path)) {
206 drop_data_->filenames.push_back( 206 drop_data_->filenames.push_back(
207 DropData::FileInfo(UTF8ToUTF16(file_path.value()), string16())); 207 DropData::FileInfo(UTF8ToUTF16(file_path.value()),
208 base::string16()));
208 // This is a hack. Some file managers also populate text/plain with 209 // This is a hack. Some file managers also populate text/plain with
209 // a file URL when dragging files, so we clear it to avoid exposing 210 // a file URL when dragging files, so we clear it to avoid exposing
210 // it to the web content. 211 // it to the web content.
211 drop_data_->text = base::NullableString16(); 212 drop_data_->text = base::NullableString16();
212 } else if (!drop_data_->url.is_valid()) { 213 } else if (!drop_data_->url.is_valid()) {
213 // Also set the first non-file URL as the URL content for the drop. 214 // Also set the first non-file URL as the URL content for the drop.
214 drop_data_->url = url; 215 drop_data_->url = url;
215 } 216 }
216 } 217 }
217 g_strfreev(uris); 218 g_strfreev(uris);
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 gtk_drag_finish(context, is_drop_target_, FALSE, time); 330 gtk_drag_finish(context, is_drop_target_, FALSE, time);
330 331
331 return TRUE; 332 return TRUE;
332 } 333 }
333 334
334 RenderViewHostImpl* WebDragDestGtk::GetRenderViewHost() const { 335 RenderViewHostImpl* WebDragDestGtk::GetRenderViewHost() const {
335 return static_cast<RenderViewHostImpl*>(web_contents_->GetRenderViewHost()); 336 return static_cast<RenderViewHostImpl*>(web_contents_->GetRenderViewHost());
336 } 337 }
337 338
338 } // namespace content 339 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_win.cc ('k') | content/browser/web_contents/web_drag_dest_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698