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

Unified Diff: chrome/browser/geolocation/chrome_geolocation_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: addresses comments Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/geolocation/chrome_geolocation_permission_context.cc
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
index e3bfc924f2cb2f1abdae72804f1179212c514c76..a2cd863a00238704dc1dac36f1ca9586a8d40ab0 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
@@ -10,6 +10,7 @@
#include "base/bind.h"
#include "base/strings/utf_string_conversions.h"
+#include "base/threading/worker_pool.h"
bulach 2014/01/15 16:22:07 nit: not needed?
acleung1 2014/02/21 21:18:00 Done.
#include "chrome/browser/content_settings/host_content_settings_map.h"
#include "chrome/browser/content_settings/permission_request_id.h"
#include "chrome/browser/content_settings/tab_specific_content_settings.h"
@@ -142,6 +143,17 @@ void ChromeGeolocationPermissionContext::DecidePermission(
}
}
+void ChromeGeolocationPermissionContext::CreateInfoBarRequest(
+ const PermissionRequestID& id,
+ const GURL& requesting_frame,
+ const GURL& embedder,
+ base::Callback<void(bool)> callback) {
+ QueueController()->CreateInfoBarRequest(
bulach 2014/01/15 16:22:07 nit: wrong indent, should be just 2
acleung1 2014/02/21 21:18:00 Isn't this part of an expression that was divided
+ id, requesting_frame, embedder, base::Bind(
+ &ChromeGeolocationPermissionContext::NotifyPermissionSet,
+ base::Unretained(this), id, requesting_frame, callback));
+}
+
void ChromeGeolocationPermissionContext::ShutdownOnUIThread() {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
permission_queue_controller_.reset();

Powered by Google App Engine
This is Rietveld 408576698