Introduce Android variants of ChromeGeolocationPermissionContext, GeolocationConfirmInfoBarDelegate

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>
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/geolocation/geolocation_infobar_queue_controller.h"
-#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/view_type_utils.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 
 using WebKit::WebSecurityOrigin;
 using content::BrowserThread;
 using content::WebContents;
 
 // GeolocationPermissionContext -----------------------------------------------
 
+#if !defined(OS_ANDROID)

[bulach, 2012/10/17 13:17:38]

if you agree with the comment in the other patch, this could be moved to real a
factory class, so that this file doesn't know anything about android..

[Ramya, 2012/10/17 21:43:31]

Done.

 ChromeGeolocationPermissionContext* ChromeGeolocationPermissionContext::Create(
     Profile *profile) {
   return new ChromeGeolocationPermissionContext(profile);
 }
 
 void ChromeGeolocationPermissionContext::RegisterUserPrefs(
     PrefService *user_prefs) {
-#if defined(OS_ANDROID)
-  user_prefs->RegisterBooleanPref(prefs::kGeolocationEnabled, true,
-                                  PrefService::UNSYNCABLE_PREF);
+}
 #endif
-}
 
 ChromeGeolocationPermissionContext::ChromeGeolocationPermissionContext(
     Profile* profile)
     : profile_(profile) {
 }
 
 ChromeGeolocationPermissionContext::~ChromeGeolocationPermissionContext() {
 }
 
 void ChromeGeolocationPermissionContext::RequestGeolocationPermission(
@@ skipping 46 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)
-  // 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);
 }