OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/frame_host/render_frame_host_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 2064 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2075 frame_tree_node_->DidStopLoading(); | 2075 frame_tree_node_->DidStopLoading(); |
2076 } | 2076 } |
2077 | 2077 |
2078 void RenderFrameHostImpl::OnDidChangeLoadProgress(double load_progress) { | 2078 void RenderFrameHostImpl::OnDidChangeLoadProgress(double load_progress) { |
2079 frame_tree_node_->DidChangeLoadProgress(load_progress); | 2079 frame_tree_node_->DidChangeLoadProgress(load_progress); |
2080 } | 2080 } |
2081 | 2081 |
2082 void RenderFrameHostImpl::OnSerializeAsMHTMLResponse( | 2082 void RenderFrameHostImpl::OnSerializeAsMHTMLResponse( |
2083 int job_id, | 2083 int job_id, |
2084 bool success, | 2084 bool success, |
2085 const std::set<std::string>& digests_of_uris_of_serialized_resources) { | 2085 const std::set<std::string>& digests_of_uris_of_serialized_resources, |
| 2086 base::TimeDelta renderer_main_thread_time) { |
2086 MHTMLGenerationManager::GetInstance()->OnSerializeAsMHTMLResponse( | 2087 MHTMLGenerationManager::GetInstance()->OnSerializeAsMHTMLResponse( |
2087 this, job_id, success, digests_of_uris_of_serialized_resources); | 2088 this, job_id, success, digests_of_uris_of_serialized_resources, |
| 2089 renderer_main_thread_time); |
2088 } | 2090 } |
2089 | 2091 |
2090 #if defined(USE_EXTERNAL_POPUP_MENU) | 2092 #if defined(USE_EXTERNAL_POPUP_MENU) |
2091 void RenderFrameHostImpl::OnShowPopup( | 2093 void RenderFrameHostImpl::OnShowPopup( |
2092 const FrameHostMsg_ShowPopup_Params& params) { | 2094 const FrameHostMsg_ShowPopup_Params& params) { |
2093 RenderViewHostDelegateView* view = | 2095 RenderViewHostDelegateView* view = |
2094 render_view_host_->delegate_->GetDelegateView(); | 2096 render_view_host_->delegate_->GetDelegateView(); |
2095 if (view) { | 2097 if (view) { |
2096 gfx::Point original_point(params.bounds.x(), params.bounds.y()); | 2098 gfx::Point original_point(params.bounds.x(), params.bounds.y()); |
2097 gfx::Point transformed_point = | 2099 gfx::Point transformed_point = |
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3099 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( | 3101 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( |
3100 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); | 3102 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); |
3101 return web_bluetooth_service_.get(); | 3103 return web_bluetooth_service_.get(); |
3102 } | 3104 } |
3103 | 3105 |
3104 void RenderFrameHostImpl::DeleteWebBluetoothService() { | 3106 void RenderFrameHostImpl::DeleteWebBluetoothService() { |
3105 web_bluetooth_service_.reset(); | 3107 web_bluetooth_service_.reset(); |
3106 } | 3108 } |
3107 | 3109 |
3108 } // namespace content | 3110 } // namespace content |
OLD | NEW |