OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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.h" | 5 #include "content/browser/renderer_host/render_view_host.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
608 file != files.end(); ++file) { | 608 file != files.end(); ++file) { |
609 ChildProcessSecurityPolicy::GetInstance()->GrantReadFile( | 609 ChildProcessSecurityPolicy::GetInstance()->GrantReadFile( |
610 process()->id(), *file); | 610 process()->id(), *file); |
611 } | 611 } |
612 Send(new ViewMsg_EnumerateDirectoryResponse(routing_id(), | 612 Send(new ViewMsg_EnumerateDirectoryResponse(routing_id(), |
613 request_id, | 613 request_id, |
614 files)); | 614 files)); |
615 } | 615 } |
616 | 616 |
617 void RenderViewHost::LoadStateChanged(const GURL& url, | 617 void RenderViewHost::LoadStateChanged(const GURL& url, |
618 net::LoadState load_state, | 618 const net::LoadStateWithParam& load_state, |
619 uint64 upload_position, | 619 uint64 upload_position, |
620 uint64 upload_size) { | 620 uint64 upload_size) { |
621 delegate_->LoadStateChanged(url, load_state, upload_position, upload_size); | 621 delegate_->LoadStateChanged(url, load_state, upload_position, upload_size); |
622 } | 622 } |
623 | 623 |
624 bool RenderViewHost::SuddenTerminationAllowed() const { | 624 bool RenderViewHost::SuddenTerminationAllowed() const { |
625 return sudden_termination_allowed_ || process()->sudden_termination_allowed(); | 625 return sudden_termination_allowed_ || process()->sudden_termination_allowed(); |
626 } | 626 } |
627 | 627 |
628 /////////////////////////////////////////////////////////////////////////////// | 628 /////////////////////////////////////////////////////////////////////////////// |
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1314 if (view) { | 1314 if (view) { |
1315 view->ShowPopupMenu(params.bounds, | 1315 view->ShowPopupMenu(params.bounds, |
1316 params.item_height, | 1316 params.item_height, |
1317 params.item_font_size, | 1317 params.item_font_size, |
1318 params.selected_item, | 1318 params.selected_item, |
1319 params.popup_items, | 1319 params.popup_items, |
1320 params.right_aligned); | 1320 params.right_aligned); |
1321 } | 1321 } |
1322 } | 1322 } |
1323 #endif | 1323 #endif |
OLD | NEW |