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 1225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1236 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); | 1236 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); |
1237 if (!view) | 1237 if (!view) |
1238 return; | 1238 return; |
1239 | 1239 |
1240 WebDropData filtered_data(drop_data); | 1240 WebDropData filtered_data(drop_data); |
1241 ChildProcessSecurityPolicyImpl* policy = | 1241 ChildProcessSecurityPolicyImpl* policy = |
1242 ChildProcessSecurityPolicyImpl::GetInstance(); | 1242 ChildProcessSecurityPolicyImpl::GetInstance(); |
1243 | 1243 |
1244 // Allow drag of Javascript URLs to enable bookmarklet drag to bookmark bar. | 1244 // Allow drag of Javascript URLs to enable bookmarklet drag to bookmark bar. |
1245 if (!filtered_data.url.SchemeIs(chrome::kJavaScriptScheme)) | 1245 if (!filtered_data.url.SchemeIs(chrome::kJavaScriptScheme)) |
1246 FilterURL(policy, GetProcess()->GetID(), false, &filtered_data.url); | 1246 FilterURL(policy, GetProcess()->GetID(), true, &filtered_data.url); |
1247 FilterURL(policy, GetProcess()->GetID(), false, &filtered_data.html_base_url); | 1247 FilterURL(policy, GetProcess()->GetID(), false, &filtered_data.html_base_url); |
1248 view->StartDragging(filtered_data, drag_operations_mask, image, image_offset); | 1248 view->StartDragging(filtered_data, drag_operations_mask, image, image_offset); |
1249 } | 1249 } |
1250 | 1250 |
1251 void RenderViewHostImpl::OnUpdateDragCursor(WebDragOperation current_op) { | 1251 void RenderViewHostImpl::OnUpdateDragCursor(WebDragOperation current_op) { |
1252 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); | 1252 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); |
1253 if (view) | 1253 if (view) |
1254 view->UpdateDragCursor(current_op); | 1254 view->UpdateDragCursor(current_op); |
1255 } | 1255 } |
1256 | 1256 |
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1727 // can cause navigations to be ignored in OnMsgNavigate. | 1727 // can cause navigations to be ignored in OnMsgNavigate. |
1728 is_waiting_for_beforeunload_ack_ = false; | 1728 is_waiting_for_beforeunload_ack_ = false; |
1729 is_waiting_for_unload_ack_ = false; | 1729 is_waiting_for_unload_ack_ = false; |
1730 } | 1730 } |
1731 | 1731 |
1732 void RenderViewHostImpl::ClearPowerSaveBlockers() { | 1732 void RenderViewHostImpl::ClearPowerSaveBlockers() { |
1733 STLDeleteValues(&power_save_blockers_); | 1733 STLDeleteValues(&power_save_blockers_); |
1734 } | 1734 } |
1735 | 1735 |
1736 } // namespace content | 1736 } // namespace content |
OLD | NEW |