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

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

Issue 2565283002: Fix webkitGetEntry for non-native files. (Closed)
Patch Set: Rebased. Created 4 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
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_widget.h" 5 #include "content/renderer/render_widget.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 } 287 }
288 288
289 for (std::vector<DropData::FileSystemFileInfo>::const_iterator it = 289 for (std::vector<DropData::FileSystemFileInfo>::const_iterator it =
290 drop_data.file_system_files.begin(); 290 drop_data.file_system_files.begin();
291 it != drop_data.file_system_files.end(); 291 it != drop_data.file_system_files.end();
292 ++it) { 292 ++it) {
293 WebDragData::Item item; 293 WebDragData::Item item;
294 item.storageType = WebDragData::Item::StorageTypeFileSystemFile; 294 item.storageType = WebDragData::Item::StorageTypeFileSystemFile;
295 item.fileSystemURL = it->url; 295 item.fileSystemURL = it->url;
296 item.fileSystemFileSize = it->size; 296 item.fileSystemFileSize = it->size;
297 item.fileSystemId = blink::WebString::fromASCII(it->filesystem_id);
297 item_list.push_back(item); 298 item_list.push_back(item);
298 } 299 }
299 300
300 for (std::map<base::string16, base::string16>::const_iterator it = 301 for (std::map<base::string16, base::string16>::const_iterator it =
301 drop_data.custom_data.begin(); 302 drop_data.custom_data.begin();
302 it != drop_data.custom_data.end(); 303 it != drop_data.custom_data.end();
303 ++it) { 304 ++it) {
304 WebDragData::Item item; 305 WebDragData::Item item;
305 item.storageType = WebDragData::Item::StorageTypeString; 306 item.storageType = WebDragData::Item::StorageTypeString;
306 item.stringType = it->first; 307 item.stringType = it->first;
(...skipping 1933 matching lines...) Expand 10 before | Expand all | Expand 10 after
2240 // browser side (https://crbug.com/669219). 2241 // browser side (https://crbug.com/669219).
2241 // If there is no WebFrameWidget, then there will be no 2242 // If there is no WebFrameWidget, then there will be no
2242 // InputMethodControllers for a WebLocalFrame. 2243 // InputMethodControllers for a WebLocalFrame.
2243 return nullptr; 2244 return nullptr;
2244 } 2245 }
2245 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) 2246 return static_cast<blink::WebFrameWidget*>(GetWebWidget())
2246 ->getActiveWebInputMethodController(); 2247 ->getActiveWebInputMethodController();
2247 } 2248 }
2248 2249
2249 } // namespace content 2250 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/drop_data_builder.cc ('k') | third_party/WebKit/Source/core/clipboard/DataObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698