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

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

Issue 213703004: Ensure that WebRTC AEC recording checkbox is not set if cancelling file dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Code review fixes + rebase. Created 6 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/webrtc_internals_message_handler.h" 5 #include "content/browser/media/webrtc_internals_message_handler.h"
6 6
7 #include "content/browser/media/webrtc_internals.h" 7 #include "content/browser/media/webrtc_internals.h"
8 #include "content/common/media/peer_connection_tracker_messages.h" 8 #include "content/common/media/peer_connection_tracker_messages.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 #include "content/public/browser/render_frame_host.h" 10 #include "content/public/browser/render_frame_host.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 RenderFrameHost* host = web_ui()->GetWebContents()->GetMainFrame(); 68 RenderFrameHost* host = web_ui()->GetWebContents()->GetMainFrame();
69 if (host) 69 if (host)
70 host->ExecuteJavaScript(script); 70 host->ExecuteJavaScript(script);
71 } 71 }
72 } 72 }
73 73
74 void WebRTCInternalsMessageHandler::OnUpdate(const std::string& command, 74 void WebRTCInternalsMessageHandler::OnUpdate(const std::string& command,
75 const base::Value* args) { 75 const base::Value* args) {
76 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 76 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
77 std::vector<const base::Value*> args_vector; 77 std::vector<const base::Value*> args_vector;
78 args_vector.push_back(args); 78 if (args)
79 args_vector.push_back(args);
79 base::string16 update = WebUI::GetJavascriptCall(command, args_vector); 80 base::string16 update = WebUI::GetJavascriptCall(command, args_vector);
80 81
81 RenderFrameHost* host = web_ui()->GetWebContents()->GetMainFrame(); 82 RenderFrameHost* host = web_ui()->GetWebContents()->GetMainFrame();
82 if (host) 83 if (host)
83 host->ExecuteJavaScript(update); 84 host->ExecuteJavaScript(update);
84 } 85 }
85 86
86 } // namespace content 87 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/webrtc_internals.cc ('k') | content/browser/media/webrtc_internals_ui_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698