Index: chrome/browser/render_view_host.cc |
=================================================================== |
--- chrome/browser/render_view_host.cc (revision 2568) |
+++ chrome/browser/render_view_host.cc (working copy) |
@@ -307,6 +307,9 @@ |
bool forward, |
bool match_case, |
bool find_next) { |
+ if (search_string.empty()) |
+ return; |
+ |
FindInPageRequest request; |
request.request_id = request_id; |
request.search_string = search_string; |
@@ -373,25 +376,6 @@ |
Send(new ViewMsg_DragTargetDrop(routing_id_, client_pt, screen_pt)); |
} |
-void RenderViewHost::UploadFile(const std::wstring& file_path, |
- const std::wstring& form, |
- const std::wstring& file, |
- const std::wstring& submit, |
- const std::wstring& other_values) { |
- if (!process_->channel()) |
- return; |
- |
- RendererSecurityPolicy::GetInstance()->GrantUploadFile(process()->host_id(), |
- file); |
- ViewMsg_UploadFile_Params p; |
- p.file_path = file_path; |
- p.form = form; |
- p.file = file; |
- p.submit = submit; |
- p.other_values = other_values; |
- Send(new ViewMsg_UploadFile(routing_id_, p)); |
-} |
- |
void RenderViewHost::ReservePageIDRange(int size) { |
Send(new ViewMsg_ReservePageIDRange(routing_id_, size)); |
} |
@@ -1140,9 +1124,11 @@ |
const std::vector<GURL>& resources_list, |
const std::vector<GURL>& referrers_list, |
const std::vector<GURL>& frames_list) { |
- delegate_->OnReceivedSavableResourceLinksForCurrentPage(resources_list, |
- referrers_list, |
- frames_list); |
+ RenderViewHostDelegate::Save* save_delegate = delegate_->GetSaveDelegate(); |
+ if (save_delegate) { |
+ save_delegate->OnReceivedSavableResourceLinksForCurrentPage( |
+ resources_list, referrers_list, frames_list); |
+ } |
} |
void RenderViewHost::OnDidGetApplicationInfo( |
@@ -1162,7 +1148,9 @@ |
void RenderViewHost::OnReceivedSerializedHtmlData(const GURL& frame_url, |
const std::string& data, |
int32 status) { |
- delegate_->OnReceivedSerializedHtmlData(frame_url, data, status); |
+ RenderViewHostDelegate::Save* save_delegate = delegate_->GetSaveDelegate(); |
+ if (save_delegate) |
+ save_delegate->OnReceivedSerializedHtmlData(frame_url, data, status); |
} |
void RenderViewHost::OnMsgShouldCloseACK(bool proceed) { |