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

Side by Side Diff: chrome/browser/geolocation/chrome_geolocation_permission_context_android.h

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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_ANDROID _H_ 5 #ifndef CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_ANDROID _H_
6 #define CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_ANDROID _H_ 6 #define CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_ANDROID _H_
7 7
8 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" 8 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
9 9
10 class GoogleLocationSettingsHelper; 10 class GoogleLocationSettingsHelper;
(...skipping 17 matching lines...) Expand all
28 base::Callback<void(bool)> callback) OVERRIDE; 28 base::Callback<void(bool)> callback) OVERRIDE;
29 29
30 virtual void PermissionDecided(const PermissionRequestID& id, 30 virtual void PermissionDecided(const PermissionRequestID& id,
31 const GURL& requesting_frame, 31 const GURL& requesting_frame,
32 const GURL& embedder, 32 const GURL& embedder,
33 base::Callback<void(bool)> callback, 33 base::Callback<void(bool)> callback,
34 bool allowed) OVERRIDE; 34 bool allowed) OVERRIDE;
35 35
36 scoped_ptr<GoogleLocationSettingsHelper> google_location_settings_helper_; 36 scoped_ptr<GoogleLocationSettingsHelper> google_location_settings_helper_;
37 37
38 private:
39 void CheckMasterLocation(const PermissionRequestID& id,
40 const GURL& requesting_frame,
41 const GURL& embedder,
42 base::Callback<void(bool)> callback);
43
44 void ProceedDecidePermission(const PermissionRequestID& id,
45 const GURL& requesting_frame,
46 const GURL& embedder,
47 base::Callback<void(bool)> callback);
48
38 DISALLOW_COPY_AND_ASSIGN(ChromeGeolocationPermissionContextAndroid); 49 DISALLOW_COPY_AND_ASSIGN(ChromeGeolocationPermissionContextAndroid);
39 }; 50 };
40 51
41 #endif // CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_ANDR OID_H_ 52 #endif // CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_ANDR OID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698