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 <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 2597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2608 MhtmlSaveStatus save_status, | 2608 MhtmlSaveStatus save_status, |
2609 const std::set<std::string>& digests_of_uris_of_serialized_resources, | 2609 const std::set<std::string>& digests_of_uris_of_serialized_resources, |
2610 base::TimeDelta renderer_main_thread_time) { | 2610 base::TimeDelta renderer_main_thread_time) { |
2611 MHTMLGenerationManager::GetInstance()->OnSerializeAsMHTMLResponse( | 2611 MHTMLGenerationManager::GetInstance()->OnSerializeAsMHTMLResponse( |
2612 this, job_id, save_status, digests_of_uris_of_serialized_resources, | 2612 this, job_id, save_status, digests_of_uris_of_serialized_resources, |
2613 renderer_main_thread_time); | 2613 renderer_main_thread_time); |
2614 } | 2614 } |
2615 | 2615 |
2616 void RenderFrameHostImpl::OnSelectionChanged(const base::string16& text, | 2616 void RenderFrameHostImpl::OnSelectionChanged(const base::string16& text, |
2617 uint32_t offset, | 2617 uint32_t offset, |
2618 const gfx::Range& range) { | 2618 const gfx::Range& range, |
| 2619 bool user_initiated) { |
2619 has_selection_ = !text.empty(); | 2620 has_selection_ = !text.empty(); |
2620 GetRenderWidgetHost()->SelectionChanged(text, offset, range); | 2621 GetRenderWidgetHost()->SelectionChanged(text, offset, range, user_initiated); |
2621 } | 2622 } |
2622 | 2623 |
2623 void RenderFrameHostImpl::OnFocusedNodeChanged( | 2624 void RenderFrameHostImpl::OnFocusedNodeChanged( |
2624 bool is_editable_element, | 2625 bool is_editable_element, |
2625 const gfx::Rect& bounds_in_frame_widget) { | 2626 const gfx::Rect& bounds_in_frame_widget) { |
2626 if (!GetView()) | 2627 if (!GetView()) |
2627 return; | 2628 return; |
2628 | 2629 |
2629 has_focused_editable_element_ = is_editable_element; | 2630 has_focused_editable_element_ = is_editable_element; |
2630 // First convert the bounds to root view. | 2631 // First convert the bounds to root view. |
(...skipping 1578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4209 } | 4210 } |
4210 | 4211 |
4211 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( | 4212 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( |
4212 const std::string& interface_name, | 4213 const std::string& interface_name, |
4213 mojo::ScopedMessagePipeHandle pipe) { | 4214 mojo::ScopedMessagePipeHandle pipe) { |
4214 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); | 4215 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); |
4215 } | 4216 } |
4216 #endif | 4217 #endif |
4217 | 4218 |
4218 } // namespace content | 4219 } // namespace content |
OLD | NEW |