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 610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
621 file != files.end(); ++file) { | 621 file != files.end(); ++file) { |
622 ChildProcessSecurityPolicy::GetInstance()->GrantReadFile( | 622 ChildProcessSecurityPolicy::GetInstance()->GrantReadFile( |
623 process()->id(), *file); | 623 process()->id(), *file); |
624 } | 624 } |
625 Send(new ViewMsg_EnumerateDirectoryResponse(routing_id(), | 625 Send(new ViewMsg_EnumerateDirectoryResponse(routing_id(), |
626 request_id, | 626 request_id, |
627 files)); | 627 files)); |
628 } | 628 } |
629 | 629 |
630 void RenderViewHost::LoadStateChanged(const GURL& url, | 630 void RenderViewHost::LoadStateChanged(const GURL& url, |
631 net::LoadState load_state, | 631 const net::LoadStateWithParam& load_state, |
632 uint64 upload_position, | 632 uint64 upload_position, |
633 uint64 upload_size) { | 633 uint64 upload_size) { |
634 delegate_->LoadStateChanged(url, load_state, upload_position, upload_size); | 634 delegate_->LoadStateChanged(url, load_state, upload_position, upload_size); |
635 } | 635 } |
636 | 636 |
637 bool RenderViewHost::SuddenTerminationAllowed() const { | 637 bool RenderViewHost::SuddenTerminationAllowed() const { |
638 return sudden_termination_allowed_ || process()->sudden_termination_allowed(); | 638 return sudden_termination_allowed_ || process()->sudden_termination_allowed(); |
639 } | 639 } |
640 | 640 |
641 /////////////////////////////////////////////////////////////////////////////// | 641 /////////////////////////////////////////////////////////////////////////////// |
(...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1334 if (view) { | 1334 if (view) { |
1335 view->ShowPopupMenu(params.bounds, | 1335 view->ShowPopupMenu(params.bounds, |
1336 params.item_height, | 1336 params.item_height, |
1337 params.item_font_size, | 1337 params.item_font_size, |
1338 params.selected_item, | 1338 params.selected_item, |
1339 params.popup_items, | 1339 params.popup_items, |
1340 params.right_aligned); | 1340 params.right_aligned); |
1341 } | 1341 } |
1342 } | 1342 } |
1343 #endif | 1343 #endif |
OLD | NEW |