| OLD | NEW |
| 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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 } | 286 } |
| 287 | 287 |
| 288 for (std::vector<DropData::FileSystemFileInfo>::const_iterator it = | 288 for (std::vector<DropData::FileSystemFileInfo>::const_iterator it = |
| 289 drop_data.file_system_files.begin(); | 289 drop_data.file_system_files.begin(); |
| 290 it != drop_data.file_system_files.end(); | 290 it != drop_data.file_system_files.end(); |
| 291 ++it) { | 291 ++it) { |
| 292 WebDragData::Item item; | 292 WebDragData::Item item; |
| 293 item.storageType = WebDragData::Item::StorageTypeFileSystemFile; | 293 item.storageType = WebDragData::Item::StorageTypeFileSystemFile; |
| 294 item.fileSystemURL = it->url; | 294 item.fileSystemURL = it->url; |
| 295 item.fileSystemFileSize = it->size; | 295 item.fileSystemFileSize = it->size; |
| 296 item.fileSystemId = blink::WebString::fromASCII(it->filesystem_id); |
| 296 item_list.push_back(item); | 297 item_list.push_back(item); |
| 297 } | 298 } |
| 298 | 299 |
| 299 for (std::map<base::string16, base::string16>::const_iterator it = | 300 for (std::map<base::string16, base::string16>::const_iterator it = |
| 300 drop_data.custom_data.begin(); | 301 drop_data.custom_data.begin(); |
| 301 it != drop_data.custom_data.end(); | 302 it != drop_data.custom_data.end(); |
| 302 ++it) { | 303 ++it) { |
| 303 WebDragData::Item item; | 304 WebDragData::Item item; |
| 304 item.storageType = WebDragData::Item::StorageTypeString; | 305 item.storageType = WebDragData::Item::StorageTypeString; |
| 305 item.stringType = it->first; | 306 item.stringType = it->first; |
| (...skipping 2004 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2310 // browser side (https://crbug.com/669219). | 2311 // browser side (https://crbug.com/669219). |
| 2311 // If there is no WebFrameWidget, then there will be no | 2312 // If there is no WebFrameWidget, then there will be no |
| 2312 // InputMethodControllers for a WebLocalFrame. | 2313 // InputMethodControllers for a WebLocalFrame. |
| 2313 return nullptr; | 2314 return nullptr; |
| 2314 } | 2315 } |
| 2315 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) | 2316 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) |
| 2316 ->getActiveWebInputMethodController(); | 2317 ->getActiveWebInputMethodController(); |
| 2317 } | 2318 } |
| 2318 | 2319 |
| 2319 } // namespace content | 2320 } // namespace content |
| OLD | NEW |