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 2552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2563 MhtmlSaveStatus save_status, | 2563 MhtmlSaveStatus save_status, |
2564 const std::set<std::string>& digests_of_uris_of_serialized_resources, | 2564 const std::set<std::string>& digests_of_uris_of_serialized_resources, |
2565 base::TimeDelta renderer_main_thread_time) { | 2565 base::TimeDelta renderer_main_thread_time) { |
2566 MHTMLGenerationManager::GetInstance()->OnSerializeAsMHTMLResponse( | 2566 MHTMLGenerationManager::GetInstance()->OnSerializeAsMHTMLResponse( |
2567 this, job_id, save_status, digests_of_uris_of_serialized_resources, | 2567 this, job_id, save_status, digests_of_uris_of_serialized_resources, |
2568 renderer_main_thread_time); | 2568 renderer_main_thread_time); |
2569 } | 2569 } |
2570 | 2570 |
2571 void RenderFrameHostImpl::OnSelectionChanged(const base::string16& text, | 2571 void RenderFrameHostImpl::OnSelectionChanged(const base::string16& text, |
2572 uint32_t offset, | 2572 uint32_t offset, |
2573 const gfx::Range& range) { | 2573 const gfx::Range& range, |
| 2574 bool user_initiated) { |
2574 has_selection_ = !text.empty(); | 2575 has_selection_ = !text.empty(); |
2575 GetRenderWidgetHost()->SelectionChanged(text, offset, range); | 2576 GetRenderWidgetHost()->SelectionChanged(text, offset, range, user_initiated); |
2576 } | 2577 } |
2577 | 2578 |
2578 void RenderFrameHostImpl::OnFocusedNodeChanged( | 2579 void RenderFrameHostImpl::OnFocusedNodeChanged( |
2579 bool is_editable_element, | 2580 bool is_editable_element, |
2580 const gfx::Rect& bounds_in_frame_widget) { | 2581 const gfx::Rect& bounds_in_frame_widget) { |
2581 if (!GetView()) | 2582 if (!GetView()) |
2582 return; | 2583 return; |
2583 | 2584 |
2584 has_focused_editable_element_ = is_editable_element; | 2585 has_focused_editable_element_ = is_editable_element; |
2585 // First convert the bounds to root view. | 2586 // First convert the bounds to root view. |
(...skipping 1556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4142 } | 4143 } |
4143 | 4144 |
4144 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( | 4145 void RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame( |
4145 const std::string& interface_name, | 4146 const std::string& interface_name, |
4146 mojo::ScopedMessagePipeHandle pipe) { | 4147 mojo::ScopedMessagePipeHandle pipe) { |
4147 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); | 4148 GetRemoteInterfaces()->GetInterface(interface_name, std::move(pipe)); |
4148 } | 4149 } |
4149 #endif | 4150 #endif |
4150 | 4151 |
4151 } // namespace content | 4152 } // namespace content |
OLD | NEW |