Chromium Code Reviews| 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/browser/media/media_internals_proxy.h" | 5 #include "content/browser/media/media_internals_proxy.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "content/browser/media/media_internals_handler.h" | 9 #include "content/browser/media/media_internals_handler.h" |
| 10 #include "content/public/browser/content_browser_client.h" | 10 #include "content/public/browser/content_browser_client.h" |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 131 MediaInternals::GetInstance()->RemoveUpdateCallback(update_callback_); | 131 MediaInternals::GetInstance()->RemoveUpdateCallback(update_callback_); |
| 132 if (GetContentClient()->browser()->GetNetLog()) { | 132 if (GetContentClient()->browser()->GetNetLog()) { |
| 133 net::NetLog* net_log = GetContentClient()->browser()->GetNetLog(); | 133 net::NetLog* net_log = GetContentClient()->browser()->GetNetLog(); |
| 134 net_log->RemoveThreadSafeObserver(this); | 134 net_log->RemoveThreadSafeObserver(this); |
| 135 } | 135 } |
| 136 } | 136 } |
| 137 | 137 |
| 138 void MediaInternalsProxy::GetEverythingOnIOThread() { | 138 void MediaInternalsProxy::GetEverythingOnIOThread() { |
| 139 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 139 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 140 MediaInternals::GetInstance()->SendAudioStreamData(); | 140 MediaInternals::GetInstance()->SendAudioStreamData(); |
| 141 MediaInternals::GetInstance()->SendVideoCaptureCapabilities(); | |
| 141 // TODO(mcasas): Collect capabilities of Video Capture devices. | 142 // TODO(mcasas): Collect capabilities of Video Capture devices. |
|
mcasas
2014/10/14 13:44:12
Remove comment.
burnik
2014/10/15 13:45:57
Done.
| |
| 142 } | 143 } |
| 143 | 144 |
| 144 void MediaInternalsProxy::UpdateUIOnUIThread(const base::string16& update) { | 145 void MediaInternalsProxy::UpdateUIOnUIThread(const base::string16& update) { |
| 145 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 146 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 146 // Don't forward updates to a destructed UI. | 147 // Don't forward updates to a destructed UI. |
| 147 if (handler_) | 148 if (handler_) |
| 148 handler_->OnUpdate(update); | 149 handler_->OnUpdate(update); |
| 149 } | 150 } |
| 150 | 151 |
| 151 void MediaInternalsProxy::AddNetEventOnUIThread(base::Value* entry) { | 152 void MediaInternalsProxy::AddNetEventOnUIThread(base::Value* entry) { |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 174 const std::string& function, base::Value* args) { | 175 const std::string& function, base::Value* args) { |
| 175 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 176 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 176 scoped_ptr<base::Value> args_value(args); | 177 scoped_ptr<base::Value> args_value(args); |
| 177 std::vector<const base::Value*> args_vector; | 178 std::vector<const base::Value*> args_vector; |
| 178 args_vector.push_back(args_value.get()); | 179 args_vector.push_back(args_value.get()); |
| 179 base::string16 update = WebUI::GetJavascriptCall(function, args_vector); | 180 base::string16 update = WebUI::GetJavascriptCall(function, args_vector); |
| 180 UpdateUIOnUIThread(update); | 181 UpdateUIOnUIThread(update); |
| 181 } | 182 } |
| 182 | 183 |
| 183 } // namespace content | 184 } // namespace content |
| OLD | NEW |