| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1459 return; | 1459 return; |
| 1460 | 1460 |
| 1461 webview()->focusedFrame()->executeCommand( | 1461 webview()->focusedFrame()->executeCommand( |
| 1462 WebString::fromUTF8(name), WebString::fromUTF8(value)); | 1462 WebString::fromUTF8(name), WebString::fromUTF8(value)); |
| 1463 } | 1463 } |
| 1464 | 1464 |
| 1465 void RenderViewImpl::OnMoveCaret(const gfx::Point& point) { | 1465 void RenderViewImpl::OnMoveCaret(const gfx::Point& point) { |
| 1466 if (!webview()) | 1466 if (!webview()) |
| 1467 return; | 1467 return; |
| 1468 | 1468 |
| 1469 Send(new ViewHostMsg_MoveCaret_ACK(routing_id_)); | 1469 Send(new InputHostMsg_MoveCaret_ACK(routing_id_)); |
| 1470 | 1470 |
| 1471 webview()->focusedFrame()->moveCaretSelection(point); | 1471 webview()->focusedFrame()->moveCaretSelection(point); |
| 1472 } | 1472 } |
| 1473 | 1473 |
| 1474 void RenderViewImpl::OnScrollFocusedEditableNodeIntoRect( | 1474 void RenderViewImpl::OnScrollFocusedEditableNodeIntoRect( |
| 1475 const gfx::Rect& rect) { | 1475 const gfx::Rect& rect) { |
| 1476 if (has_scrolled_focused_editable_node_into_rect_ && | 1476 if (has_scrolled_focused_editable_node_into_rect_ && |
| 1477 rect == rect_for_scrolled_focused_editable_node_) { | 1477 rect == rect_for_scrolled_focused_editable_node_) { |
| 1478 return; | 1478 return; |
| 1479 } | 1479 } |
| (...skipping 2707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4187 std::vector<gfx::Size> sizes; | 4187 std::vector<gfx::Size> sizes; |
| 4188 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4188 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4189 if (!url.isEmpty()) | 4189 if (!url.isEmpty()) |
| 4190 urls.push_back( | 4190 urls.push_back( |
| 4191 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4191 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4192 } | 4192 } |
| 4193 SendUpdateFaviconURL(urls); | 4193 SendUpdateFaviconURL(urls); |
| 4194 } | 4194 } |
| 4195 | 4195 |
| 4196 } // namespace content | 4196 } // namespace content |
| OLD | NEW |