OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "chrome/browser/renderer_host/render_view_host.h" | 5 #include "chrome/browser/renderer_host/render_view_host.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
(...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
707 const std::vector<FilePath>& files) { | 707 const std::vector<FilePath>& files) { |
708 for (std::vector<FilePath>::const_iterator file = files.begin(); | 708 for (std::vector<FilePath>::const_iterator file = files.begin(); |
709 file != files.end(); ++file) { | 709 file != files.end(); ++file) { |
710 ChildProcessSecurityPolicy::GetInstance()->GrantUploadFile( | 710 ChildProcessSecurityPolicy::GetInstance()->GrantUploadFile( |
711 process()->id(), *file); | 711 process()->id(), *file); |
712 } | 712 } |
713 Send(new ViewMsg_RunFileChooserResponse(routing_id(), files)); | 713 Send(new ViewMsg_RunFileChooserResponse(routing_id(), files)); |
714 } | 714 } |
715 | 715 |
716 void RenderViewHost::LoadStateChanged(const GURL& url, | 716 void RenderViewHost::LoadStateChanged(const GURL& url, |
717 net::LoadState load_state) { | 717 net::LoadState load_state, |
718 delegate_->LoadStateChanged(url, load_state); | 718 uint64 upload_position, |
| 719 uint64 upload_size) { |
| 720 delegate_->LoadStateChanged(url, load_state, upload_position, upload_size); |
719 } | 721 } |
720 | 722 |
721 bool RenderViewHost::SuddenTerminationAllowed() const { | 723 bool RenderViewHost::SuddenTerminationAllowed() const { |
722 return sudden_termination_allowed_ || process()->sudden_termination_allowed(); | 724 return sudden_termination_allowed_ || process()->sudden_termination_allowed(); |
723 } | 725 } |
724 | 726 |
725 /////////////////////////////////////////////////////////////////////////////// | 727 /////////////////////////////////////////////////////////////////////////////// |
726 // RenderViewHost, IPC message handlers: | 728 // RenderViewHost, IPC message handlers: |
727 | 729 |
728 void RenderViewHost::OnMessageReceived(const IPC::Message& msg) { | 730 void RenderViewHost::OnMessageReceived(const IPC::Message& msg) { |
(...skipping 962 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1691 } | 1693 } |
1692 | 1694 |
1693 void RenderViewHost::ResetModalDialogEvent() { | 1695 void RenderViewHost::ResetModalDialogEvent() { |
1694 if (--modal_dialog_count_ == 0) | 1696 if (--modal_dialog_count_ == 0) |
1695 modal_dialog_event_->Reset(); | 1697 modal_dialog_event_->Reset(); |
1696 } | 1698 } |
1697 | 1699 |
1698 void RenderViewHost::UpdateBrowserWindowId(int window_id) { | 1700 void RenderViewHost::UpdateBrowserWindowId(int window_id) { |
1699 Send(new ViewMsg_UpdateBrowserWindowId(routing_id(), window_id)); | 1701 Send(new ViewMsg_UpdateBrowserWindowId(routing_id(), window_id)); |
1700 } | 1702 } |
OLD | NEW |