| 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 1541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1552 if (frames_in_progress_ == 0) { | 1552 if (frames_in_progress_ == 0) { |
| 1553 DidStopLoadingIcons(); | 1553 DidStopLoadingIcons(); |
| 1554 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidStopLoading()); | 1554 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidStopLoading()); |
| 1555 } | 1555 } |
| 1556 } | 1556 } |
| 1557 | 1557 |
| 1558 void RenderViewImpl::didCancelCompositionOnSelectionChange() { | 1558 void RenderViewImpl::didCancelCompositionOnSelectionChange() { |
| 1559 Send(new ViewHostMsg_ImeCancelComposition(routing_id())); | 1559 Send(new ViewHostMsg_ImeCancelComposition(routing_id())); |
| 1560 } | 1560 } |
| 1561 | 1561 |
| 1562 void RenderViewImpl::didExecuteCommand(const WebString& command_name) { | |
| 1563 const std::string& name = base::UTF16ToUTF8(command_name); | |
| 1564 if (StartsWithASCII(name, "Move", true) || | |
| 1565 StartsWithASCII(name, "Insert", true) || | |
| 1566 StartsWithASCII(name, "Delete", true)) | |
| 1567 return; | |
| 1568 RenderThreadImpl::current()->RecordComputedAction(name); | |
| 1569 } | |
| 1570 | |
| 1571 bool RenderViewImpl::handleCurrentKeyboardEvent() { | 1562 bool RenderViewImpl::handleCurrentKeyboardEvent() { |
| 1572 if (edit_commands_.empty()) | 1563 if (edit_commands_.empty()) |
| 1573 return false; | 1564 return false; |
| 1574 | 1565 |
| 1575 WebFrame* frame = webview()->focusedFrame(); | 1566 WebFrame* frame = webview()->focusedFrame(); |
| 1576 if (!frame) | 1567 if (!frame) |
| 1577 return false; | 1568 return false; |
| 1578 | 1569 |
| 1579 EditCommands::iterator it = edit_commands_.begin(); | 1570 EditCommands::iterator it = edit_commands_.begin(); |
| 1580 EditCommands::iterator end = edit_commands_.end(); | 1571 EditCommands::iterator end = edit_commands_.end(); |
| (...skipping 2498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4079 std::vector<gfx::Size> sizes; | 4070 std::vector<gfx::Size> sizes; |
| 4080 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4071 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4081 if (!url.isEmpty()) | 4072 if (!url.isEmpty()) |
| 4082 urls.push_back( | 4073 urls.push_back( |
| 4083 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4074 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4084 } | 4075 } |
| 4085 SendUpdateFaviconURL(urls); | 4076 SendUpdateFaviconURL(urls); |
| 4086 } | 4077 } |
| 4087 | 4078 |
| 4088 } // namespace content | 4079 } // namespace content |
| OLD | NEW |