| 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 5738 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5749 blink::WebUserMediaClient* RenderViewImpl::userMediaClient() { | 5749 blink::WebUserMediaClient* RenderViewImpl::userMediaClient() { |
| 5750 // This can happen in tests, in which case it's OK to return NULL. | 5750 // This can happen in tests, in which case it's OK to return NULL. |
| 5751 if (!InitializeMediaStreamClient()) | 5751 if (!InitializeMediaStreamClient()) |
| 5752 return NULL; | 5752 return NULL; |
| 5753 | 5753 |
| 5754 return web_user_media_client_; | 5754 return web_user_media_client_; |
| 5755 } | 5755 } |
| 5756 | 5756 |
| 5757 blink::WebMIDIClient* RenderViewImpl::webMIDIClient() { | 5757 blink::WebMIDIClient* RenderViewImpl::webMIDIClient() { |
| 5758 if (!midi_dispatcher_) | 5758 if (!midi_dispatcher_) |
| 5759 midi_dispatcher_ = new MIDIDispatcher(this); | 5759 midi_dispatcher_ = new MidiDispatcher(this); |
| 5760 return midi_dispatcher_; | 5760 return midi_dispatcher_; |
| 5761 } | 5761 } |
| 5762 | 5762 |
| 5763 void RenderViewImpl::draggableRegionsChanged() { | 5763 void RenderViewImpl::draggableRegionsChanged() { |
| 5764 FOR_EACH_OBSERVER( | 5764 FOR_EACH_OBSERVER( |
| 5765 RenderViewObserver, | 5765 RenderViewObserver, |
| 5766 observers_, | 5766 observers_, |
| 5767 DraggableRegionsChanged(webview()->mainFrame())); | 5767 DraggableRegionsChanged(webview()->mainFrame())); |
| 5768 } | 5768 } |
| 5769 | 5769 |
| (...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6109 for (size_t i = 0; i < icon_urls.size(); i++) { | 6109 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6110 WebURL url = icon_urls[i].iconURL(); | 6110 WebURL url = icon_urls[i].iconURL(); |
| 6111 if (!url.isEmpty()) | 6111 if (!url.isEmpty()) |
| 6112 urls.push_back(FaviconURL(url, | 6112 urls.push_back(FaviconURL(url, |
| 6113 ToFaviconType(icon_urls[i].iconType()))); | 6113 ToFaviconType(icon_urls[i].iconType()))); |
| 6114 } | 6114 } |
| 6115 SendUpdateFaviconURL(urls); | 6115 SendUpdateFaviconURL(urls); |
| 6116 } | 6116 } |
| 6117 | 6117 |
| 6118 } // namespace content | 6118 } // namespace content |
| OLD | NEW |