Update geolocation infobar to handle Android system settings

chrome/browser/geolocation/chrome_geolocation_permission_context.cc

 // 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.
 
 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
 
 #include <functional>
 #include <string>
 #include <vector>
 
@@ skipping 77 matching lines @@
     const GURL& requesting_frame) {
   CancelPendingInfoBarRequest(render_process_id, render_view_id, bridge_id);
 }
 
 void ChromeGeolocationPermissionContext::DecidePermission(
     int render_process_id, int render_view_id, int bridge_id,
     const GURL& requesting_frame, const GURL& embedder,
     base::Callback<void(bool)> callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
+#if defined(OS_ANDROID)

[John Knottenbelt, 2012/10/23 13:10:05]

Remove this diff as the code is already in
ChromeGeolocationPermissionContextAndroid::DecidePermission

[Ramya, 2012/10/23 21:57:14]

Done.

+  // Check to see if the feature in its entirety has been disabled.
+  // This must happen before other services (e.g. tabs, extensions)
+  // get an opportunity to allow the geolocation request.
+  if (!profile()->GetPrefs()->GetBoolean(prefs::kGeolocationEnabled)) {
+    PermissionDecided(render_process_id, render_view_id, bridge_id,
+                      requesting_frame, embedder, callback, false);
+    return;
+  }
+#endif
+
   ExtensionService* extension_service = profile_->GetExtensionService();
   if (extension_service) {
     const extensions::Extension* extension =
         extension_service->extensions()->GetExtensionOrAppByURL(
             ExtensionURLInfo(
                 WebSecurityOrigin::createFromString(
                     UTF8ToUTF16(requesting_frame.spec())),
                 requesting_frame));
     if (extension &&
         extension->HasAPIPermission(extensions::APIPermission::kGeolocation)) {
@@ skipping 91 matching lines @@
             &ChromeGeolocationPermissionContext::CancelPendingInfoBarRequest,
             this, render_process_id, render_view_id, bridge_id));
      return;
   }
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   QueueController()->CancelInfoBarRequest(
       render_process_id,
       render_view_id,
       bridge_id);
 }