Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Side by Side Diff: content/browser/media/media_internals_proxy.cc

Issue 643343004: Video Capture Capabilities available on chrome://media-internals (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits @ xhwang Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 // TODO(mcasas): Collect capabilities of Video Capture devices. 141 MediaInternals::GetInstance()->SendVideoCaptureDeviceCapabilities();
142 } 142 }
143 143
144 void MediaInternalsProxy::UpdateUIOnUIThread(const base::string16& update) { 144 void MediaInternalsProxy::UpdateUIOnUIThread(const base::string16& update) {
145 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 145 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
146 // Don't forward updates to a destructed UI. 146 // Don't forward updates to a destructed UI.
147 if (handler_) 147 if (handler_)
148 handler_->OnUpdate(update); 148 handler_->OnUpdate(update);
149 } 149 }
150 150
151 void MediaInternalsProxy::AddNetEventOnUIThread(base::Value* entry) { 151 void MediaInternalsProxy::AddNetEventOnUIThread(base::Value* entry) {
(...skipping 22 matching lines...) Expand all
174 const std::string& function, base::Value* args) { 174 const std::string& function, base::Value* args) {
175 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 175 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
176 scoped_ptr<base::Value> args_value(args); 176 scoped_ptr<base::Value> args_value(args);
177 std::vector<const base::Value*> args_vector; 177 std::vector<const base::Value*> args_vector;
178 args_vector.push_back(args_value.get()); 178 args_vector.push_back(args_value.get());
179 base::string16 update = WebUI::GetJavascriptCall(function, args_vector); 179 base::string16 update = WebUI::GetJavascriptCall(function, args_vector);
180 UpdateUIOnUIThread(update); 180 UpdateUIOnUIThread(update);
181 } 181 }
182 182
183 } // namespace content 183 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/media_internals.cc ('k') | content/browser/media/media_internals_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698