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