[WebsiteSettings] Change permission bubble API to adapt to new mocks.

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 10 matching lines @@
 #include "chrome/browser/ui/website_settings/permission_bubble_request.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 "extensions/browser/extension_registry.h"
 #include "extensions/browser/process_map.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/extension.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using extensions::APIPermission;
 using extensions::ExtensionRegistry;
 
 class GeolocationPermissionRequest : public PermissionBubbleRequest {
  public:
   GeolocationPermissionRequest(
       ChromeGeolocationPermissionContext* context,
       const PermissionRequestID& id,
       const GURL& requesting_frame,
       base::Callback<void(bool)> callback,
       const std::string& display_languages);
   virtual ~GeolocationPermissionRequest();
 
   // PermissionBubbleDelegate:
+  virtual int GetIconID() const OVERRIDE;
   virtual base::string16 GetMessageText() const OVERRIDE;
   virtual base::string16 GetMessageTextFragment() const OVERRIDE;
-  virtual base::string16 GetAlternateAcceptButtonText() const OVERRIDE;
-  virtual base::string16 GetAlternateDenyButtonText() const OVERRIDE;
+  virtual bool HasUserGesture() const OVERRIDE;
   virtual void PermissionGranted() OVERRIDE;
   virtual void PermissionDenied() OVERRIDE;
   virtual void Cancelled() OVERRIDE;
   virtual void RequestFinished() OVERRIDE;
 
  private:
   ChromeGeolocationPermissionContext* context_;
   PermissionRequestID id_;
   GURL requesting_frame_;
   base::Callback<void(bool)> callback_;
   std::string display_languages_;
 };
 
 GeolocationPermissionRequest::GeolocationPermissionRequest(
     ChromeGeolocationPermissionContext* context,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     base::Callback<void(bool)> callback,
     const std::string& display_languages)
     : context_(context),
       id_(id),
       requesting_frame_(requesting_frame),
       callback_(callback),
       display_languages_(display_languages) {}
 
 GeolocationPermissionRequest::~GeolocationPermissionRequest() {}
 
+int GeolocationPermissionRequest::GetIconID() const {
+  return IDR_GEOLOCATION_INFOBAR_ICON;
+}
+
 base::string16 GeolocationPermissionRequest::GetMessageText() const {
   return l10n_util::GetStringFUTF16(IDS_GEOLOCATION_INFOBAR_QUESTION,
       net::FormatUrl(requesting_frame_, display_languages_));
 }
 
 base::string16 GeolocationPermissionRequest::GetMessageTextFragment() const {
   return l10n_util::GetStringUTF16(IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT);
 }
 
-base::string16
-GeolocationPermissionRequest::GetAlternateAcceptButtonText() const {
-  return l10n_util::GetStringUTF16(IDS_GEOLOCATION_ALLOW_BUTTON);
-}
-
-base::string16
-GeolocationPermissionRequest::GetAlternateDenyButtonText() const {
-  return l10n_util::GetStringUTF16(IDS_GEOLOCATION_DENY_BUTTON);
+bool GeolocationPermissionRequest::HasUserGesture() const {
+  // TODO(gbillock): plumb this through from GeolocationDispatcher.
+  return false;
 }
 
 void GeolocationPermissionRequest::PermissionGranted() {
   context_->NotifyPermissionSet(id_, requesting_frame_, callback_, true);
 }
 
 void GeolocationPermissionRequest::PermissionDenied() {
   context_->NotifyPermissionSet(id_, requesting_frame_, callback_, false);
 }
 
@@ skipping 84 matching lines @@
 
   DecidePermission(web_contents, id, requesting_frame_origin,
                    embedder, callback);
 }
 
 void ChromeGeolocationPermissionContext::CancelGeolocationPermissionRequest(
     int render_process_id,
     int render_view_id,
     int bridge_id,
     const GURL& requesting_frame) {
+  // TODO(gbillock): cancel permission bubble request.
   CancelPendingInfobarRequest(PermissionRequestID(
       render_process_id, render_view_id, bridge_id, 0));
 }
 
 void ChromeGeolocationPermissionContext::DecidePermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const GURL& embedder,
     base::Callback<void(bool)> callback) {
@@ skipping 87 matching lines @@
             this, id));
      return;
   }
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (shutting_down_)
     return;
 
   // TODO(gbillock): handle permission bubble cancellation.
   QueueController()->CancelInfoBarRequest(id);
 }