| 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 6093 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6104 void RenderViewImpl::cancelScheduledContentIntents() { | 6104 void RenderViewImpl::cancelScheduledContentIntents() { |
| 6105 ++expected_content_intent_id_; | 6105 ++expected_content_intent_id_; |
| 6106 } | 6106 } |
| 6107 | 6107 |
| 6108 void RenderViewImpl::LaunchAndroidContentIntent(const GURL& intent, | 6108 void RenderViewImpl::LaunchAndroidContentIntent(const GURL& intent, |
| 6109 size_t request_id) { | 6109 size_t request_id) { |
| 6110 if (request_id != expected_content_intent_id_) | 6110 if (request_id != expected_content_intent_id_) |
| 6111 return; | 6111 return; |
| 6112 | 6112 |
| 6113 // Remove the content highlighting if any. | 6113 // Remove the content highlighting if any. |
| 6114 scheduleComposite(); | 6114 ScheduleComposite(); |
| 6115 | 6115 |
| 6116 if (!intent.is_empty()) | 6116 if (!intent.is_empty()) |
| 6117 Send(new ViewHostMsg_StartContentIntent(routing_id_, intent)); | 6117 Send(new ViewHostMsg_StartContentIntent(routing_id_, intent)); |
| 6118 } | 6118 } |
| 6119 | 6119 |
| 6120 bool RenderViewImpl::openDateTimeChooser( | 6120 bool RenderViewImpl::openDateTimeChooser( |
| 6121 const blink::WebDateTimeChooserParams& params, | 6121 const blink::WebDateTimeChooserParams& params, |
| 6122 blink::WebDateTimeChooserCompletion* completion) { | 6122 blink::WebDateTimeChooserCompletion* completion) { |
| 6123 // JavaScript may try to open a date time chooser while one is already open. | 6123 // JavaScript may try to open a date time chooser while one is already open. |
| 6124 if (date_time_picker_client_) | 6124 if (date_time_picker_client_) |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6427 for (size_t i = 0; i < icon_urls.size(); i++) { | 6427 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6428 WebURL url = icon_urls[i].iconURL(); | 6428 WebURL url = icon_urls[i].iconURL(); |
| 6429 if (!url.isEmpty()) | 6429 if (!url.isEmpty()) |
| 6430 urls.push_back(FaviconURL(url, | 6430 urls.push_back(FaviconURL(url, |
| 6431 ToFaviconType(icon_urls[i].iconType()))); | 6431 ToFaviconType(icon_urls[i].iconType()))); |
| 6432 } | 6432 } |
| 6433 SendUpdateFaviconURL(urls); | 6433 SendUpdateFaviconURL(urls); |
| 6434 } | 6434 } |
| 6435 | 6435 |
| 6436 } // namespace content | 6436 } // namespace content |
| OLD | NEW |