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

Side by Side Diff: chrome/browser/geolocation/chrome_geolocation_permission_context.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: Added back some asserts / comments. Created 7 years, 4 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_H_ 5 #ifndef CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_H_
6 #define CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_H_ 6 #define CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 bool allowed); 77 bool allowed);
78 78
79 // Create an PermissionQueueController. overriden in derived classes to 79 // Create an PermissionQueueController. overriden in derived classes to
80 // provide additional UI flow. Called on the UI thread. 80 // provide additional UI flow. Called on the UI thread.
81 virtual PermissionQueueController* CreateQueueController(); 81 virtual PermissionQueueController* CreateQueueController();
82 82
83 private: 83 private:
84 // Removes any pending InfoBar request. 84 // Removes any pending InfoBar request.
85 void CancelPendingInfoBarRequest(const PermissionRequestID& id); 85 void CancelPendingInfoBarRequest(const PermissionRequestID& id);
86 86
87 // Creates and show an info bar.
88 void CreateInfoBarRequest(const PermissionRequestID& id,
89 const GURL& requesting_frame,
90 const GURL& embedder,
91 base::Callback<void(bool)> callback);
bulach 2013/09/04 18:48:53 nit: indentation
acleung1 2013/09/05 21:50:16 Done.
92
87 // These must only be accessed from the UI thread. 93 // These must only be accessed from the UI thread.
88 Profile* const profile_; 94 Profile* const profile_;
89 bool shutting_down_; 95 bool shutting_down_;
90 scoped_ptr<PermissionQueueController> permission_queue_controller_; 96 scoped_ptr<PermissionQueueController> permission_queue_controller_;
91 97
92 DISALLOW_COPY_AND_ASSIGN(ChromeGeolocationPermissionContext); 98 DISALLOW_COPY_AND_ASSIGN(ChromeGeolocationPermissionContext);
93 }; 99 };
94 100
95 #endif // CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_H_ 101 #endif // CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698