| 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 6109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6120 void RenderViewImpl::cancelScheduledContentIntents() { | 6120 void RenderViewImpl::cancelScheduledContentIntents() { |
| 6121 ++expected_content_intent_id_; | 6121 ++expected_content_intent_id_; |
| 6122 } | 6122 } |
| 6123 | 6123 |
| 6124 void RenderViewImpl::LaunchAndroidContentIntent(const GURL& intent, | 6124 void RenderViewImpl::LaunchAndroidContentIntent(const GURL& intent, |
| 6125 size_t request_id) { | 6125 size_t request_id) { |
| 6126 if (request_id != expected_content_intent_id_) | 6126 if (request_id != expected_content_intent_id_) |
| 6127 return; | 6127 return; |
| 6128 | 6128 |
| 6129 // Remove the content highlighting if any. | 6129 // Remove the content highlighting if any. |
| 6130 scheduleComposite(); | 6130 ScheduleComposite(); |
| 6131 | 6131 |
| 6132 if (!intent.is_empty()) | 6132 if (!intent.is_empty()) |
| 6133 Send(new ViewHostMsg_StartContentIntent(routing_id_, intent)); | 6133 Send(new ViewHostMsg_StartContentIntent(routing_id_, intent)); |
| 6134 } | 6134 } |
| 6135 | 6135 |
| 6136 bool RenderViewImpl::openDateTimeChooser( | 6136 bool RenderViewImpl::openDateTimeChooser( |
| 6137 const blink::WebDateTimeChooserParams& params, | 6137 const blink::WebDateTimeChooserParams& params, |
| 6138 blink::WebDateTimeChooserCompletion* completion) { | 6138 blink::WebDateTimeChooserCompletion* completion) { |
| 6139 // JavaScript may try to open a date time chooser while one is already open. | 6139 // JavaScript may try to open a date time chooser while one is already open. |
| 6140 if (date_time_picker_client_) | 6140 if (date_time_picker_client_) |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6443 for (size_t i = 0; i < icon_urls.size(); i++) { | 6443 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6444 WebURL url = icon_urls[i].iconURL(); | 6444 WebURL url = icon_urls[i].iconURL(); |
| 6445 if (!url.isEmpty()) | 6445 if (!url.isEmpty()) |
| 6446 urls.push_back(FaviconURL(url, | 6446 urls.push_back(FaviconURL(url, |
| 6447 ToFaviconType(icon_urls[i].iconType()))); | 6447 ToFaviconType(icon_urls[i].iconType()))); |
| 6448 } | 6448 } |
| 6449 SendUpdateFaviconURL(urls); | 6449 SendUpdateFaviconURL(urls); |
| 6450 } | 6450 } |
| 6451 | 6451 |
| 6452 } // namespace content | 6452 } // namespace content |
| OLD | NEW |