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 746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
757 fileapi::FileSystemContext* file_system_context = | 757 fileapi::FileSystemContext* file_system_context = |
758 BrowserContext::GetStoragePartition( | 758 BrowserContext::GetStoragePartition( |
759 GetProcess()->GetBrowserContext(), | 759 GetProcess()->GetBrowserContext(), |
760 GetSiteInstance())->GetFileSystemContext(); | 760 GetSiteInstance())->GetFileSystemContext(); |
761 for (size_t i = 0; i < filtered_data.file_system_files.size(); ++i) { | 761 for (size_t i = 0; i < filtered_data.file_system_files.size(); ++i) { |
762 fileapi::FileSystemURL file_system_url = | 762 fileapi::FileSystemURL file_system_url = |
763 file_system_context->CrackURL(filtered_data.file_system_files[i].url); | 763 file_system_context->CrackURL(filtered_data.file_system_files[i].url); |
764 | 764 |
765 std::string register_name; | 765 std::string register_name; |
766 std::string filesystem_id = isolated_context->RegisterFileSystemForPath( | 766 std::string filesystem_id = isolated_context->RegisterFileSystemForPath( |
767 file_system_url.type(), file_system_url.path(), ®ister_name); | 767 file_system_url.type(), file_system_url.filesystem_id(), |
| 768 file_system_url.path(), ®ister_name); |
768 policy->GrantReadFileSystem(renderer_id, filesystem_id); | 769 policy->GrantReadFileSystem(renderer_id, filesystem_id); |
769 | 770 |
770 // Note: We are using the origin URL provided by the sender here. It may be | 771 // Note: We are using the origin URL provided by the sender here. It may be |
771 // different from the receiver's. | 772 // different from the receiver's. |
772 filtered_data.file_system_files[i].url = GURL( | 773 filtered_data.file_system_files[i].url = GURL( |
773 fileapi::GetIsolatedFileSystemRootURIString( | 774 fileapi::GetIsolatedFileSystemRootURIString( |
774 file_system_url.origin(), | 775 file_system_url.origin(), |
775 filesystem_id, | 776 filesystem_id, |
776 std::string()).append(register_name)); | 777 std::string()).append(register_name)); |
777 } | 778 } |
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1679 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1680 FrameTree* frame_tree = delegate_->GetFrameTree(); |
1680 | 1681 |
1681 frame_tree->ResetForMainFrameSwap(); | 1682 frame_tree->ResetForMainFrameSwap(); |
1682 } | 1683 } |
1683 | 1684 |
1684 void RenderViewHostImpl::SelectWordAroundCaret() { | 1685 void RenderViewHostImpl::SelectWordAroundCaret() { |
1685 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1686 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
1686 } | 1687 } |
1687 | 1688 |
1688 } // namespace content | 1689 } // namespace content |
OLD | NEW |