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

Side by Side Diff: chrome/browser/media/protected_media_identifier_permission_context.cc

Issue 23345004: Fix Android strict-mode violation in GeoLocation info bar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments / fix tests 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
« no previous file with comments | « chrome/browser/media/chrome_midi_permission_context.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 PermissionDecided(id, requesting_frame, embedder, callback, false); 114 PermissionDecided(id, requesting_frame, embedder, callback, false);
115 break; 115 break;
116 case CONTENT_SETTING_ALLOW: 116 case CONTENT_SETTING_ALLOW:
117 PermissionDecided(id, requesting_frame, embedder, callback, true); 117 PermissionDecided(id, requesting_frame, embedder, callback, true);
118 break; 118 break;
119 case CONTENT_SETTING_ASK: 119 case CONTENT_SETTING_ASK:
120 QueueController()->CreateInfoBarRequest( 120 QueueController()->CreateInfoBarRequest(
121 id, 121 id,
122 requesting_frame, 122 requesting_frame,
123 embedder, 123 embedder,
124 std::string(),
124 base::Bind(&ProtectedMediaIdentifierPermissionContext:: 125 base::Bind(&ProtectedMediaIdentifierPermissionContext::
125 NotifyPermissionSet, 126 NotifyPermissionSet,
126 base::Unretained(this), 127 base::Unretained(this),
127 id, 128 id,
128 requesting_frame, 129 requesting_frame,
129 callback)); 130 callback));
130 rvh->DisableFullscreenEncryptedMediaPlayback(); 131 rvh->DisableFullscreenEncryptedMediaPlayback();
131 break; 132 break;
132 default: 133 default:
133 NOTREACHED(); 134 NOTREACHED();
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 CancelPendingInfobarRequests, 196 CancelPendingInfobarRequests,
196 this, 197 this,
197 group_id)); 198 group_id));
198 return; 199 return;
199 } 200 }
200 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 201 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
201 if (shutting_down_) 202 if (shutting_down_)
202 return; 203 return;
203 QueueController()->CancelInfoBarRequests(group_id); 204 QueueController()->CancelInfoBarRequests(group_id);
204 } 205 }
OLDNEW
« no previous file with comments | « chrome/browser/media/chrome_midi_permission_context.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698