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

chrome/browser/media/media_stream_devices_controller.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/media/media_stream_devices_controller.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 331 matching lines @@
   NotifyUIRequestDenied();
 
   if (update_content_setting)
     SetPermission(false);
 
   content::MediaResponseCallback cb = callback_;
   callback_.Reset();
   cb.Run(content::MediaStreamDevices(), scoped_ptr<content::MediaStreamUI>());
 }
 
+int MediaStreamDevicesController::GetIconID() const {
+  if (HasVideo())
+    return IDR_INFOBAR_MEDIA_STREAM_CAMERA;
+
+  return IDR_INFOBAR_MEDIA_STREAM_MIC;
+}
+
 base::string16 MediaStreamDevicesController::GetMessageText() const {
   int message_id = IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO;
   if (!HasAudio())
     message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY;
   else if (!HasVideo())
     message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY;
   return l10n_util::GetStringFUTF16(
       message_id, base::UTF8ToUTF16(GetSecurityOriginSpec()));
 }
 
 base::string16 MediaStreamDevicesController::GetMessageTextFragment() const {
   int message_id = IDS_MEDIA_CAPTURE_AUDIO_AND_VIDEO_PERMISSION_FRAGMENT;
   if (!HasAudio())
     message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY_PERMISSION_FRAGMENT;
   else if (!HasVideo())
     message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY_PERMISSION_FRAGMENT;
   return l10n_util::GetStringUTF16(message_id);
 }
 
-base::string16
-MediaStreamDevicesController::GetAlternateAcceptButtonText() const {
-  return l10n_util::GetStringUTF16(IDS_MEDIA_CAPTURE_ALLOW);
-}
-
-base::string16
-MediaStreamDevicesController::GetAlternateDenyButtonText() const {
-  return l10n_util::GetStringUTF16(IDS_MEDIA_CAPTURE_DENY);
+bool MediaStreamDevicesController::HasUserGesture() const {
+  // TODO(gbillock): plumb this through
+  return false;
 }
 
 void MediaStreamDevicesController::PermissionGranted() {
   GURL origin(GetSecurityOriginSpec());
   if (origin.SchemeIsSecure()) {
     UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions",
                               kAllowHttps, kPermissionActionsMax);
   } else {
     UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions",
                               kAllowHttp, kPermissionActionsMax);
@@ skipping 231 matching lines @@
           it->second.permission == MEDIA_ALLOWED);
 }
 
 bool MediaStreamDevicesController::IsDeviceVideoCaptureRequestedAndAllowed()
     const {
   MediaStreamTypeSettingsMap::const_iterator it =
       request_permissions_.find(content::MEDIA_DEVICE_VIDEO_CAPTURE);
   return (it != request_permissions_.end() &&
           it->second.permission == MEDIA_ALLOWED);
 }