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/browser/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
545 } | 545 } |
546 | 546 |
547 filesets.insert(path); | 547 filesets.insert(path); |
548 } | 548 } |
549 | 549 |
550 fileapi::IsolatedContext* isolated_context = | 550 fileapi::IsolatedContext* isolated_context = |
551 fileapi::IsolatedContext::GetInstance(); | 551 fileapi::IsolatedContext::GetInstance(); |
552 DCHECK(isolated_context); | 552 DCHECK(isolated_context); |
553 std::string filesystem_id = isolated_context->RegisterIsolatedFileSystem( | 553 std::string filesystem_id = isolated_context->RegisterIsolatedFileSystem( |
554 filesets); | 554 filesets); |
| 555 DCHECK(!filesystem_id.empty()); |
555 policy->GrantReadFileSystem(renderer_id, filesystem_id); | 556 policy->GrantReadFileSystem(renderer_id, filesystem_id); |
556 filtered_data.filesystem_id = UTF8ToUTF16(filesystem_id); | 557 filtered_data.filesystem_id = UTF8ToUTF16(filesystem_id); |
557 | 558 |
558 Send(new DragMsg_TargetDragEnter(GetRoutingID(), filtered_data, client_pt, | 559 Send(new DragMsg_TargetDragEnter(GetRoutingID(), filtered_data, client_pt, |
559 screen_pt, operations_allowed, | 560 screen_pt, operations_allowed, |
560 key_modifiers)); | 561 key_modifiers)); |
561 } | 562 } |
562 | 563 |
563 void RenderViewHostImpl::DragTargetDragOver( | 564 void RenderViewHostImpl::DragTargetDragOver( |
564 const gfx::Point& client_pt, | 565 const gfx::Point& client_pt, |
(...skipping 1278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1843 // can cause navigations to be ignored in OnMsgNavigate. | 1844 // can cause navigations to be ignored in OnMsgNavigate. |
1844 is_waiting_for_beforeunload_ack_ = false; | 1845 is_waiting_for_beforeunload_ack_ = false; |
1845 is_waiting_for_unload_ack_ = false; | 1846 is_waiting_for_unload_ack_ = false; |
1846 } | 1847 } |
1847 | 1848 |
1848 void RenderViewHostImpl::ClearPowerSaveBlockers() { | 1849 void RenderViewHostImpl::ClearPowerSaveBlockers() { |
1849 STLDeleteValues(&power_save_blockers_); | 1850 STLDeleteValues(&power_save_blockers_); |
1850 } | 1851 } |
1851 | 1852 |
1852 } // namespace content | 1853 } // namespace content |
OLD | NEW |