| OLD | NEW |
| 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 "chrome/browser/media/protected_media_identifier_permission_context.h" | 5 #include "chrome/browser/media/protected_media_identifier_permission_context.h" |
| 6 | 6 |
| 7 #include <functional> | 7 #include <functional> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 PermissionDecided(id, origin, embedder, callback, false); | 130 PermissionDecided(id, origin, embedder, callback, false); |
| 131 break; | 131 break; |
| 132 case CONTENT_SETTING_ALLOW: | 132 case CONTENT_SETTING_ALLOW: |
| 133 PermissionDecided(id, origin, embedder, callback, true); | 133 PermissionDecided(id, origin, embedder, callback, true); |
| 134 break; | 134 break; |
| 135 case CONTENT_SETTING_ASK: | 135 case CONTENT_SETTING_ASK: |
| 136 QueueController()->CreateInfoBarRequest( | 136 QueueController()->CreateInfoBarRequest( |
| 137 id, | 137 id, |
| 138 origin, | 138 origin, |
| 139 embedder, | 139 embedder, |
| 140 std::string(), | |
| 141 base::Bind(&ProtectedMediaIdentifierPermissionContext:: | 140 base::Bind(&ProtectedMediaIdentifierPermissionContext:: |
| 142 NotifyPermissionSet, | 141 NotifyPermissionSet, |
| 143 base::Unretained(this), | 142 base::Unretained(this), |
| 144 id, | 143 id, |
| 145 origin, | 144 origin, |
| 146 callback)); | 145 callback)); |
| 147 break; | 146 break; |
| 148 default: | 147 default: |
| 149 NOTREACHED(); | 148 NOTREACHED(); |
| 150 } | 149 } |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 origin)); | 216 origin)); |
| 218 return; | 217 return; |
| 219 } | 218 } |
| 220 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 219 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
| 221 if (shutting_down_) | 220 if (shutting_down_) |
| 222 return; | 221 return; |
| 223 QueueController()->CancelInfoBarRequest( | 222 QueueController()->CancelInfoBarRequest( |
| 224 PermissionRequestID(render_process_id, render_view_id, 0, | 223 PermissionRequestID(render_process_id, render_view_id, 0, |
| 225 origin)); | 224 origin)); |
| 226 } | 225 } |
| OLD | NEW |