| 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 3533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3544 void RenderViewImpl::cancelScheduledContentIntents() { | 3544 void RenderViewImpl::cancelScheduledContentIntents() { |
| 3545 ++expected_content_intent_id_; | 3545 ++expected_content_intent_id_; |
| 3546 } | 3546 } |
| 3547 | 3547 |
| 3548 void RenderViewImpl::LaunchAndroidContentIntent(const GURL& intent, | 3548 void RenderViewImpl::LaunchAndroidContentIntent(const GURL& intent, |
| 3549 size_t request_id) { | 3549 size_t request_id) { |
| 3550 if (request_id != expected_content_intent_id_) | 3550 if (request_id != expected_content_intent_id_) |
| 3551 return; | 3551 return; |
| 3552 | 3552 |
| 3553 // Remove the content highlighting if any. | 3553 // Remove the content highlighting if any. |
| 3554 scheduleComposite(); | 3554 ScheduleComposite(); |
| 3555 | 3555 |
| 3556 if (!intent.is_empty()) | 3556 if (!intent.is_empty()) |
| 3557 Send(new ViewHostMsg_StartContentIntent(routing_id_, intent)); | 3557 Send(new ViewHostMsg_StartContentIntent(routing_id_, intent)); |
| 3558 } | 3558 } |
| 3559 | 3559 |
| 3560 bool RenderViewImpl::openDateTimeChooser( | 3560 bool RenderViewImpl::openDateTimeChooser( |
| 3561 const blink::WebDateTimeChooserParams& params, | 3561 const blink::WebDateTimeChooserParams& params, |
| 3562 blink::WebDateTimeChooserCompletion* completion) { | 3562 blink::WebDateTimeChooserCompletion* completion) { |
| 3563 // JavaScript may try to open a date time chooser while one is already open. | 3563 // JavaScript may try to open a date time chooser while one is already open. |
| 3564 if (date_time_picker_client_) | 3564 if (date_time_picker_client_) |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3778 std::vector<gfx::Size> sizes; | 3778 std::vector<gfx::Size> sizes; |
| 3779 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3779 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 3780 if (!url.isEmpty()) | 3780 if (!url.isEmpty()) |
| 3781 urls.push_back( | 3781 urls.push_back( |
| 3782 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3782 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 3783 } | 3783 } |
| 3784 SendUpdateFaviconURL(urls); | 3784 SendUpdateFaviconURL(urls); |
| 3785 } | 3785 } |
| 3786 | 3786 |
| 3787 } // namespace content | 3787 } // namespace content |
| OLD | NEW |