Fix Android strict-mode violation in GeoLocation info bar.

chrome/browser/geolocation/chrome_geolocation_permission_context_android.h

 // Copyright (c) 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_CHROME_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_
 #define CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_
 
 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
 
 namespace content {
@@ skipping 12 matching lines @@
  private:
   friend class ChromeGeolocationPermissionContext;
 
   virtual ~ChromeGeolocationPermissionContextAndroid();
 
   // ChromeGeolocationPermissionContext implementation:
   virtual void DecidePermission(content::WebContents* web_contents,
                                 const PermissionRequestID& id,
                                 const GURL& requesting_frame,
                                 const GURL& embedder,
+                                const std::string accept_button_label,

[bulach, 2014/02/14 11:36:48]

nit: &

[acleung1, 2014/02/21 21:18:01]

Done.

                                 base::Callback<void(bool)> callback) OVERRIDE;
 
   virtual void PermissionDecided(const PermissionRequestID& id,
                                  const GURL& requesting_frame,
                                  const GURL& embedder,
                                  base::Callback<void(bool)> callback,
                                  bool allowed) OVERRIDE;
 
+  void ProceedDecidePermission(content::WebContents* web_contents,
+                               const PermissionRequestID& id,
+                               const GURL& requesting_frame,
+                               const GURL& embedder,
+                               const std::string accept_button_label,

[bulach, 2014/02/14 11:36:48]

nit: &

[acleung1, 2014/02/21 21:18:01]

Done.

+                               base::Callback<void(bool)> callback);
+
   scoped_ptr<GoogleLocationSettingsHelper> google_location_settings_helper_;
 
+ private:
+  void CheckMasterLocation(content::WebContents* web_contents,
+                           const PermissionRequestID& id,
+                           const GURL& requesting_frame,
+                           const GURL& embedder,
+                           base::Callback<void(bool)> callback);
+
   DISALLOW_COPY_AND_ASSIGN(ChromeGeolocationPermissionContextAndroid);
 };
 
 #endif  // CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_