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

Side by Side Diff: content/browser/renderer_host/media/midi_dispatcher_host.cc

Issue 216473002: Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in content/browser/renderer_hos… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync to r260263 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/renderer_host/media/midi_dispatcher_host.h" 5 #include "content/browser/renderer_host/media/midi_dispatcher_host.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "content/browser/child_process_security_policy_impl.h" 8 #include "content/browser/child_process_security_policy_impl.h"
9 #include "content/browser/renderer_host/render_view_host_impl.h" 9 #include "content/browser/renderer_host/render_view_host_impl.h"
10 #include "content/common/media/midi_messages.h" 10 #include "content/common/media/midi_messages.h"
(...skipping 29 matching lines...) Expand all
40 void MidiDispatcherHost::OverrideThreadForMessage( 40 void MidiDispatcherHost::OverrideThreadForMessage(
41 const IPC::Message& message, BrowserThread::ID* thread) { 41 const IPC::Message& message, BrowserThread::ID* thread) {
42 if (IPC_MESSAGE_CLASS(message) == MidiMsgStart) 42 if (IPC_MESSAGE_CLASS(message) == MidiMsgStart)
43 *thread = BrowserThread::UI; 43 *thread = BrowserThread::UI;
44 } 44 }
45 45
46 void MidiDispatcherHost::OnRequestSysExPermission(int render_view_id, 46 void MidiDispatcherHost::OnRequestSysExPermission(int render_view_id,
47 int bridge_id, 47 int bridge_id,
48 const GURL& origin, 48 const GURL& origin,
49 bool user_gesture) { 49 bool user_gesture) {
50 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 50 DCHECK_CURRENTLY_ON(BrowserThread::UI);
51 51
52 browser_context_->RequestMidiSysExPermission( 52 browser_context_->RequestMidiSysExPermission(
53 render_process_id_, 53 render_process_id_,
54 render_view_id, 54 render_view_id,
55 bridge_id, 55 bridge_id,
56 origin, 56 origin,
57 user_gesture, 57 user_gesture,
58 base::Bind(&MidiDispatcherHost::WasSysExPermissionGranted, 58 base::Bind(&MidiDispatcherHost::WasSysExPermissionGranted,
59 base::Unretained(this), 59 base::Unretained(this),
60 render_view_id, 60 render_view_id,
61 bridge_id)); 61 bridge_id));
62 } 62 }
63 63
64 void MidiDispatcherHost::OnCancelSysExPermissionRequest( 64 void MidiDispatcherHost::OnCancelSysExPermissionRequest(
65 int render_view_id, 65 int render_view_id,
66 int bridge_id, 66 int bridge_id,
67 const GURL& requesting_frame) { 67 const GURL& requesting_frame) {
68 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 68 DCHECK_CURRENTLY_ON(BrowserThread::UI);
69 DVLOG(1) << __FUNCTION__ << " " << render_process_id_ << ":" << render_view_id 69 DVLOG(1) << __FUNCTION__ << " " << render_process_id_ << ":" << render_view_id
70 << ":" << bridge_id; 70 << ":" << bridge_id;
71 browser_context_->CancelMidiSysExPermissionRequest( 71 browser_context_->CancelMidiSysExPermissionRequest(
72 render_process_id_, render_view_id, bridge_id, requesting_frame); 72 render_process_id_, render_view_id, bridge_id, requesting_frame);
73 } 73 }
74 void MidiDispatcherHost::WasSysExPermissionGranted(int render_view_id, 74 void MidiDispatcherHost::WasSysExPermissionGranted(int render_view_id,
75 int bridge_id, 75 int bridge_id,
76 bool success) { 76 bool success) {
77 ChildProcessSecurityPolicyImpl::GetInstance()->GrantSendMidiSysExMessage( 77 ChildProcessSecurityPolicyImpl::GetInstance()->GrantSendMidiSysExMessage(
78 render_process_id_); 78 render_process_id_);
79 Send(new MidiMsg_SysExPermissionApproved(render_view_id, bridge_id, success)); 79 Send(new MidiMsg_SysExPermissionApproved(render_view_id, bridge_id, success));
80 } 80 }
81 81
82 } // namespace content 82 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698