Simplify Android geolocation permission checks

chrome/browser/geolocation/geolocation_infobar_delegate.h

Index: chrome/browser/geolocation/geolocation_infobar_delegate.h
diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate.h b/chrome/browser/geolocation/geolocation_infobar_delegate.h
index 6d9d23ad9e63dbc19c65ac2f30639f974926e773..30bc7356a1ab63e23253caf4d48c602e2693ced9 100644
--- a/chrome/browser/geolocation/geolocation_infobar_delegate.h
+++ b/chrome/browser/geolocation/geolocation_infobar_delegate.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -25,33 +25,19 @@ class GeolocationInfoBarDelegate : public ConfirmInfoBarDelegate {
                                    PermissionQueueController* controller,
                                    const PermissionRequestID& id,
                                    const GURL& requesting_frame,
-                                   const std::string& display_languages,
-                                   const std::string& accept_button_label);
+                                   const std::string& display_languages);
 
- protected:
+ private:
   GeolocationInfoBarDelegate(PermissionQueueController* controller,
                              const PermissionRequestID& id,
                              const GURL& requesting_frame,
                              int contents_unique_id,
-                             const std::string& display_languages,
-                             const std::string& accept_button_label);
+                             const std::string& display_languages);
   virtual ~GeolocationInfoBarDelegate();
 
-  // ConfirmInfoBarDelegate:
-  virtual bool Accept() OVERRIDE;
-
-  // Call back to the controller, to inform of the user's decision.
-  void SetPermission(bool update_content_setting, bool allowed);
-
-  // Marks a flag internally to indicate that the user has interacted with the
-  // bar. This makes it possible to log from the destructor when the bar has not
-  // been used, i.e. it has been ignored by the user.
-  void set_user_has_interacted() {
-    user_has_interacted_ = true;
-  }
 
- private:
   // ConfirmInfoBarDelegate:
+  virtual bool Accept() OVERRIDE;
   virtual void InfoBarDismissed() OVERRIDE;
   virtual int GetIconID() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
@@ -63,6 +49,17 @@ class GeolocationInfoBarDelegate : public ConfirmInfoBarDelegate {
   virtual base::string16 GetLinkText() const OVERRIDE;
   virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
 
+
+  // Call back to the controller, to inform of the user's decision.
+  void SetPermission(bool update_content_setting, bool allowed);
+
+  // Marks a flag internally to indicate that the user has interacted with the
+  // bar. This makes it possible to log from the destructor when the bar has not
+  // been used, i.e. it has been ignored by the user.
+  void set_user_has_interacted() {
+    user_has_interacted_ = true;
+  }
+
   PermissionQueueController* controller_;
   const PermissionRequestID id_;
   GURL requesting_frame_;