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 2047 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2058 frame_tree_node_->DidStopLoading(); | 2058 frame_tree_node_->DidStopLoading(); |
2059 } | 2059 } |
2060 | 2060 |
2061 void RenderFrameHostImpl::OnDidChangeLoadProgress(double load_progress) { | 2061 void RenderFrameHostImpl::OnDidChangeLoadProgress(double load_progress) { |
2062 frame_tree_node_->DidChangeLoadProgress(load_progress); | 2062 frame_tree_node_->DidChangeLoadProgress(load_progress); |
2063 } | 2063 } |
2064 | 2064 |
2065 void RenderFrameHostImpl::OnSerializeAsMHTMLResponse( | 2065 void RenderFrameHostImpl::OnSerializeAsMHTMLResponse( |
2066 int job_id, | 2066 int job_id, |
2067 bool success, | 2067 bool success, |
2068 const std::set<std::string>& digests_of_uris_of_serialized_resources) { | 2068 const std::set<std::string>& digests_of_uris_of_serialized_resources, |
| 2069 base::TimeDelta renderer_main_thread_time) { |
2069 MHTMLGenerationManager::GetInstance()->OnSerializeAsMHTMLResponse( | 2070 MHTMLGenerationManager::GetInstance()->OnSerializeAsMHTMLResponse( |
2070 this, job_id, success, digests_of_uris_of_serialized_resources); | 2071 this, job_id, success, digests_of_uris_of_serialized_resources, |
| 2072 renderer_main_thread_time); |
2071 } | 2073 } |
2072 | 2074 |
2073 #if defined(USE_EXTERNAL_POPUP_MENU) | 2075 #if defined(USE_EXTERNAL_POPUP_MENU) |
2074 void RenderFrameHostImpl::OnShowPopup( | 2076 void RenderFrameHostImpl::OnShowPopup( |
2075 const FrameHostMsg_ShowPopup_Params& params) { | 2077 const FrameHostMsg_ShowPopup_Params& params) { |
2076 RenderViewHostDelegateView* view = | 2078 RenderViewHostDelegateView* view = |
2077 render_view_host_->delegate_->GetDelegateView(); | 2079 render_view_host_->delegate_->GetDelegateView(); |
2078 if (view) { | 2080 if (view) { |
2079 gfx::Point original_point(params.bounds.x(), params.bounds.y()); | 2081 gfx::Point original_point(params.bounds.x(), params.bounds.y()); |
2080 gfx::Point transformed_point = | 2082 gfx::Point transformed_point = |
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3082 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( | 3084 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( |
3083 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); | 3085 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); |
3084 return web_bluetooth_service_.get(); | 3086 return web_bluetooth_service_.get(); |
3085 } | 3087 } |
3086 | 3088 |
3087 void RenderFrameHostImpl::DeleteWebBluetoothService() { | 3089 void RenderFrameHostImpl::DeleteWebBluetoothService() { |
3088 web_bluetooth_service_.reset(); | 3090 web_bluetooth_service_.reset(); |
3089 } | 3091 } |
3090 | 3092 |
3091 } // namespace content | 3093 } // namespace content |
OLD | NEW |