Simplify Android geolocation permission checks

chrome/browser/geolocation/geolocation_permission_context.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_H_
 #define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_H_
 
 #include <map>
 #include <string>
 
 #include "base/callback.h"
@@ skipping 56 matching lines @@
   // GeolocationPermissionContext implementation:
   // Decide whether the geolocation permission should be granted.
   // Calls PermissionDecided if permission can be decided non-interactively,
   // or NotifyPermissionSet if permission decided by presenting an
   // infobar to the user. Called on the UI thread.
   virtual void DecidePermission(content::WebContents* web_contents,
                                 const PermissionRequestID& id,
                                 const GURL& requesting_frame,
                                 bool user_gesture,
                                 const GURL& embedder,
-                                const std::string& accept_button_label,
                                 base::Callback<void(bool)> callback);
 
   // Called when permission is granted without interactively asking
   // the user. Can be overridden to introduce additional UI flow.
   // Should ultimately ensure that NotifyPermissionSet is called.
   // Called on the UI thread.
   virtual void PermissionDecided(const PermissionRequestID& id,
                                  const GURL& requesting_frame,
                                  const GURL& embedder,
                                  base::Callback<void(bool)> callback,
                                  bool allowed);
 
   // Create an PermissionQueueController. overriden in derived classes to
   // provide additional UI flow.  Called on the UI thread.
   virtual PermissionQueueController* CreateQueueController();
 
  private:
   friend class base::RefCountedThreadSafe<GeolocationPermissionContext>;
   friend class GeolocationPermissionRequest;
 
   // Removes any pending InfoBar request.
   void CancelPendingInfobarRequest(const PermissionRequestID& id);
 
   // Creates and show an info bar.
   void CreateInfoBarRequest(const PermissionRequestID& id,
                             const GURL& requesting_frame,
                             const GURL& embedder,
-                            const std::string accept_button_label,
                             base::Callback<void(bool)> callback);
 
   // Notify the context that a particular request object is no longer needed.
   void RequestFinished(GeolocationPermissionRequest* request);
 
   // These must only be accessed from the UI thread.
   Profile* const profile_;
   bool shutting_down_;
   scoped_ptr<PermissionQueueController> permission_queue_controller_;
   GeolocationPermissionContextExtensions extensions_context_;
 
   base::ScopedPtrHashMap<std::string, GeolocationPermissionRequest>
       pending_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(GeolocationPermissionContext);
 };
 
 #endif  // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_H_