| 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 1325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1336 IPC::Message* msg = new ViewHostMsg_StartPluginIme(routing_id()); | 1336 IPC::Message* msg = new ViewHostMsg_StartPluginIme(routing_id()); |
| 1337 // This message can be sent during event-handling, and needs to be delivered | 1337 // This message can be sent during event-handling, and needs to be delivered |
| 1338 // within that context. | 1338 // within that context. |
| 1339 msg->set_unblock(true); | 1339 msg->set_unblock(true); |
| 1340 Send(msg); | 1340 Send(msg); |
| 1341 } | 1341 } |
| 1342 #endif // defined(OS_MACOSX) | 1342 #endif // defined(OS_MACOSX) |
| 1343 | 1343 |
| 1344 #endif // ENABLE_PLUGINS | 1344 #endif // ENABLE_PLUGINS |
| 1345 | 1345 |
| 1346 void RenderViewImpl::TransferActiveWheelFlingAnimation( | |
| 1347 const WebKit::WebActiveWheelFlingParameters& params) { | |
| 1348 if (webview()) | |
| 1349 webview()->transferActiveWheelFlingAnimation(params); | |
| 1350 } | |
| 1351 | |
| 1352 bool RenderViewImpl::HasIMETextFocus() { | 1346 bool RenderViewImpl::HasIMETextFocus() { |
| 1353 return GetTextInputType() != ui::TEXT_INPUT_TYPE_NONE; | 1347 return GetTextInputType() != ui::TEXT_INPUT_TYPE_NONE; |
| 1354 } | 1348 } |
| 1355 | 1349 |
| 1356 bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) { | 1350 bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) { |
| 1357 WebFrame* main_frame = webview() ? webview()->mainFrame() : NULL; | 1351 WebFrame* main_frame = webview() ? webview()->mainFrame() : NULL; |
| 1358 if (main_frame) | 1352 if (main_frame) |
| 1359 GetContentClient()->SetActiveURL(main_frame->document().url()); | 1353 GetContentClient()->SetActiveURL(main_frame->document().url()); |
| 1360 | 1354 |
| 1361 ObserverListBase<RenderViewObserver>::Iterator it(observers_); | 1355 ObserverListBase<RenderViewObserver>::Iterator it(observers_); |
| (...skipping 5224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6586 for (size_t i = 0; i < icon_urls.size(); i++) { | 6580 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6587 WebURL url = icon_urls[i].iconURL(); | 6581 WebURL url = icon_urls[i].iconURL(); |
| 6588 if (!url.isEmpty()) | 6582 if (!url.isEmpty()) |
| 6589 urls.push_back(FaviconURL(url, | 6583 urls.push_back(FaviconURL(url, |
| 6590 ToFaviconType(icon_urls[i].iconType()))); | 6584 ToFaviconType(icon_urls[i].iconType()))); |
| 6591 } | 6585 } |
| 6592 SendUpdateFaviconURL(urls); | 6586 SendUpdateFaviconURL(urls); |
| 6593 } | 6587 } |
| 6594 | 6588 |
| 6595 } // namespace content | 6589 } // namespace content |
| OLD | NEW |