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

Side by Side Diff: chrome/browser/media/chrome_midi_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: rewrite Created 6 years, 10 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 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/chrome_midi_permission_context.h" 5 #include "chrome/browser/media/chrome_midi_permission_context.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/content_settings/host_content_settings_map.h" 8 #include "chrome/browser/content_settings/host_content_settings_map.h"
9 #include "chrome/browser/content_settings/permission_queue_controller.h" 9 #include "chrome/browser/content_settings/permission_queue_controller.h"
10 #include "chrome/browser/content_settings/permission_request_id.h" 10 #include "chrome/browser/content_settings/permission_request_id.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 std::string()); 92 std::string());
93 switch (content_setting) { 93 switch (content_setting) {
94 case CONTENT_SETTING_BLOCK: 94 case CONTENT_SETTING_BLOCK:
95 PermissionDecided(id, requesting_frame, embedder, callback, false); 95 PermissionDecided(id, requesting_frame, embedder, callback, false);
96 break; 96 break;
97 case CONTENT_SETTING_ALLOW: 97 case CONTENT_SETTING_ALLOW:
98 PermissionDecided(id, requesting_frame, embedder, callback, true); 98 PermissionDecided(id, requesting_frame, embedder, callback, true);
99 break; 99 break;
100 default: 100 default:
101 GetQueueController()->CreateInfoBarRequest( 101 GetQueueController()->CreateInfoBarRequest(
102 id, requesting_frame, embedder, base::Bind( 102 id, requesting_frame, embedder, "", base::Bind(
103 &ChromeMidiPermissionContext::NotifyPermissionSet, 103 &ChromeMidiPermissionContext::NotifyPermissionSet,
104 base::Unretained(this), id, requesting_frame, callback)); 104 base::Unretained(this), id, requesting_frame, callback));
105 } 105 }
106 } 106 }
107 107
108 void ChromeMidiPermissionContext::PermissionDecided( 108 void ChromeMidiPermissionContext::PermissionDecided(
109 const PermissionRequestID& id, 109 const PermissionRequestID& id,
110 const GURL& requesting_frame, 110 const GURL& requesting_frame,
111 const GURL& embedder, 111 const GURL& embedder,
112 const content::BrowserContext::MidiSysExPermissionCallback& callback, 112 const content::BrowserContext::MidiSysExPermissionCallback& callback,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 return permission_queue_controller_.get(); 144 return permission_queue_controller_.get();
145 } 145 }
146 146
147 void ChromeMidiPermissionContext::CancelPendingInfobarRequest( 147 void ChromeMidiPermissionContext::CancelPendingInfobarRequest(
148 const PermissionRequestID& id) { 148 const PermissionRequestID& id) {
149 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 149 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
150 if (shutting_down_) 150 if (shutting_down_)
151 return; 151 return;
152 GetQueueController()->CancelInfoBarRequest(id); 152 GetQueueController()->CancelInfoBarRequest(id);
153 } 153 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698