| 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 1447 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1458     return; |  1458     return; | 
|  1459  |  1459  | 
|  1460   webview()->focusedFrame()->executeCommand( |  1460   webview()->focusedFrame()->executeCommand( | 
|  1461       WebString::fromUTF8(name), WebString::fromUTF8(value)); |  1461       WebString::fromUTF8(name), WebString::fromUTF8(value)); | 
|  1462 } |  1462 } | 
|  1463  |  1463  | 
|  1464 void RenderViewImpl::OnMoveCaret(const gfx::Point& point) { |  1464 void RenderViewImpl::OnMoveCaret(const gfx::Point& point) { | 
|  1465   if (!webview()) |  1465   if (!webview()) | 
|  1466     return; |  1466     return; | 
|  1467  |  1467  | 
|  1468   Send(new ViewHostMsg_MoveCaret_ACK(routing_id_)); |  1468   Send(new InputHostMsg_MoveCaret_ACK(routing_id_)); | 
|  1469  |  1469  | 
|  1470   webview()->focusedFrame()->moveCaretSelection(point); |  1470   webview()->focusedFrame()->moveCaretSelection(point); | 
|  1471 } |  1471 } | 
|  1472  |  1472  | 
|  1473 void RenderViewImpl::OnScrollFocusedEditableNodeIntoRect( |  1473 void RenderViewImpl::OnScrollFocusedEditableNodeIntoRect( | 
|  1474     const gfx::Rect& rect) { |  1474     const gfx::Rect& rect) { | 
|  1475   if (has_scrolled_focused_editable_node_into_rect_ && |  1475   if (has_scrolled_focused_editable_node_into_rect_ && | 
|  1476       rect == rect_for_scrolled_focused_editable_node_) { |  1476       rect == rect_for_scrolled_focused_editable_node_) { | 
|  1477     return; |  1477     return; | 
|  1478   } |  1478   } | 
| (...skipping 2738 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  4217     std::vector<gfx::Size> sizes; |  4217     std::vector<gfx::Size> sizes; | 
|  4218     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |  4218     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 
|  4219     if (!url.isEmpty()) |  4219     if (!url.isEmpty()) | 
|  4220       urls.push_back( |  4220       urls.push_back( | 
|  4221           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |  4221           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 
|  4222   } |  4222   } | 
|  4223   SendUpdateFaviconURL(urls); |  4223   SendUpdateFaviconURL(urls); | 
|  4224 } |  4224 } | 
|  4225  |  4225  | 
|  4226 }  // namespace content |  4226 }  // namespace content | 
| OLD | NEW |