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

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

Issue 616833004: chrome://media-internals: update MediaInternals when devices capabilities are enumerated. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: perkj@s comments 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 128
129 void MediaInternalsProxy::StopObservingMediaInternalsOnIOThread() { 129 void MediaInternalsProxy::StopObservingMediaInternalsOnIOThread() {
130 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 130 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
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() {
wolenetz 2014/10/09 20:51:43 ditto: s/Everything/something audio specific/ for
mcasas 2014/10/10 11:30:42 Added a TODO(), I don't think it's worth renaming
139 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 139 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
140 MediaInternals::GetInstance()->SendEverything(); 140 MediaInternals::GetInstance()->SendAudioStreamData();
141 } 141 }
142 142
143 void MediaInternalsProxy::UpdateUIOnUIThread(const base::string16& update) { 143 void MediaInternalsProxy::UpdateUIOnUIThread(const base::string16& update) {
144 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 144 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
145 // Don't forward updates to a destructed UI. 145 // Don't forward updates to a destructed UI.
146 if (handler_) 146 if (handler_)
147 handler_->OnUpdate(update); 147 handler_->OnUpdate(update);
148 } 148 }
149 149
150 void MediaInternalsProxy::AddNetEventOnUIThread(base::Value* entry) { 150 void MediaInternalsProxy::AddNetEventOnUIThread(base::Value* entry) {
(...skipping 22 matching lines...) Expand all
173 const std::string& function, base::Value* args) { 173 const std::string& function, base::Value* args) {
174 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 174 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
175 scoped_ptr<base::Value> args_value(args); 175 scoped_ptr<base::Value> args_value(args);
176 std::vector<const base::Value*> args_vector; 176 std::vector<const base::Value*> args_vector;
177 args_vector.push_back(args_value.get()); 177 args_vector.push_back(args_value.get());
178 base::string16 update = WebUI::GetJavascriptCall(function, args_vector); 178 base::string16 update = WebUI::GetJavascriptCall(function, args_vector);
179 UpdateUIOnUIThread(update); 179 UpdateUIOnUIThread(update);
180 } 180 }
181 181
182 } // namespace content 182 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698