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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 242643004: Support drag and drop of files with filesystem: URL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix SEGV during tests Created 6 years, 8 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 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/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 drop_data.filenames.begin(); 604 drop_data.filenames.begin();
605 it != drop_data.filenames.end(); 605 it != drop_data.filenames.end();
606 ++it) { 606 ++it) {
607 WebDragData::Item item; 607 WebDragData::Item item;
608 item.storageType = WebDragData::Item::StorageTypeFilename; 608 item.storageType = WebDragData::Item::StorageTypeFilename;
609 item.filenameData = it->path.AsUTF16Unsafe(); 609 item.filenameData = it->path.AsUTF16Unsafe();
610 item.displayNameData = it->display_name.AsUTF16Unsafe(); 610 item.displayNameData = it->display_name.AsUTF16Unsafe();
611 item_list.push_back(item); 611 item_list.push_back(item);
612 } 612 }
613 613
614 for (std::vector<DropData::FileSystemFileInfo>::const_iterator it =
615 drop_data.file_system_files.begin();
616 it != drop_data.file_system_files.end();
617 ++it) {
618 WebDragData::Item item;
619 item.storageType = WebDragData::Item::StorageTypeFileSystemFile;
620 item.fileSystemURL = it->url;
621 item.fileSystemFileSize = it->size;
622 item_list.push_back(item);
623 }
624
614 for (std::map<base::string16, base::string16>::const_iterator it = 625 for (std::map<base::string16, base::string16>::const_iterator it =
615 drop_data.custom_data.begin(); 626 drop_data.custom_data.begin();
616 it != drop_data.custom_data.end(); 627 it != drop_data.custom_data.end();
617 ++it) { 628 ++it) {
618 WebDragData::Item item; 629 WebDragData::Item item;
619 item.storageType = WebDragData::Item::StorageTypeString; 630 item.storageType = WebDragData::Item::StorageTypeString;
620 item.stringType = it->first; 631 item.stringType = it->first;
621 item.stringData = it->second; 632 item.stringData = it->second;
622 item_list.push_back(item); 633 item_list.push_back(item);
623 } 634 }
(...skipping 3894 matching lines...) Expand 10 before | Expand all | Expand 10 after
4518 std::vector<gfx::Size> sizes; 4529 std::vector<gfx::Size> sizes;
4519 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4530 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4520 if (!url.isEmpty()) 4531 if (!url.isEmpty())
4521 urls.push_back( 4532 urls.push_back(
4522 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4533 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4523 } 4534 }
4524 SendUpdateFaviconURL(urls); 4535 SendUpdateFaviconURL(urls);
4525 } 4536 }
4526 4537
4527 } // namespace content 4538 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698