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 778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
789 Send(new ViewMsg_SetInitialFocus(GetRoutingID(), reverse)); | 789 Send(new ViewMsg_SetInitialFocus(GetRoutingID(), reverse)); |
790 } | 790 } |
791 | 791 |
792 void RenderViewHostImpl::FilesSelectedInChooser( | 792 void RenderViewHostImpl::FilesSelectedInChooser( |
793 const std::vector<ui::SelectedFileInfo>& files, | 793 const std::vector<ui::SelectedFileInfo>& files, |
794 int permissions) { | 794 int permissions) { |
795 // Grant the security access requested to the given files. | 795 // Grant the security access requested to the given files. |
796 for (size_t i = 0; i < files.size(); ++i) { | 796 for (size_t i = 0; i < files.size(); ++i) { |
797 const ui::SelectedFileInfo& file = files[i]; | 797 const ui::SelectedFileInfo& file = files[i]; |
798 ChildProcessSecurityPolicyImpl::GetInstance()->GrantPermissionsForFile( | 798 ChildProcessSecurityPolicyImpl::GetInstance()->GrantPermissionsForFile( |
799 GetProcess()->GetID(), file.path, permissions); | 799 GetProcess()->GetID(), file.real_path, permissions); |
800 } | 800 } |
801 Send(new ViewMsg_RunFileChooserResponse(GetRoutingID(), files)); | 801 Send(new ViewMsg_RunFileChooserResponse(GetRoutingID(), files)); |
802 } | 802 } |
803 | 803 |
804 void RenderViewHostImpl::DirectoryEnumerationFinished( | 804 void RenderViewHostImpl::DirectoryEnumerationFinished( |
805 int request_id, | 805 int request_id, |
806 const std::vector<FilePath>& files) { | 806 const std::vector<FilePath>& files) { |
807 // Grant the security access requested to the given files. | 807 // Grant the security access requested to the given files. |
808 for (std::vector<FilePath>::const_iterator file = files.begin(); | 808 for (std::vector<FilePath>::const_iterator file = files.begin(); |
809 file != files.end(); ++file) { | 809 file != files.end(); ++file) { |
(...skipping 1071 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1881 // can cause navigations to be ignored in OnMsgNavigate. | 1881 // can cause navigations to be ignored in OnMsgNavigate. |
1882 is_waiting_for_beforeunload_ack_ = false; | 1882 is_waiting_for_beforeunload_ack_ = false; |
1883 is_waiting_for_unload_ack_ = false; | 1883 is_waiting_for_unload_ack_ = false; |
1884 } | 1884 } |
1885 | 1885 |
1886 void RenderViewHostImpl::ClearPowerSaveBlockers() { | 1886 void RenderViewHostImpl::ClearPowerSaveBlockers() { |
1887 STLDeleteValues(&power_save_blockers_); | 1887 STLDeleteValues(&power_save_blockers_); |
1888 } | 1888 } |
1889 | 1889 |
1890 } // namespace content | 1890 } // namespace content |
OLD | NEW |