permissions: switch from explicitly passing queue controller to callbacks

chrome/browser/permissions/permission_queue_controller.cc

 // Copyright 2013 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/permissions/permission_queue_controller.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/geolocation/geolocation_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 95 matching lines @@
 }
 
 void PermissionQueueController::PendingInfobarRequest::RunCallback(
     ContentSetting content_setting) {
   callback_.Run(content_setting);
 }
 
 void PermissionQueueController::PendingInfobarRequest::CreateInfoBar(
     PermissionQueueController* controller,
     const std::string& display_languages) {
+  base::Callback<void(bool, bool)> callback =

[mlamouri (slow - plz ping), 2015/09/15 12:55:59]

rename to PermissionInfobarDelegate::PermissionSetCallback

[Lalit Maganti, 2015/09/15 14:19:25]

Done.

+      base::Bind(&PermissionQueueController::OnPermissionSet,
+                 base::Unretained(controller),

[mlamouri (slow - plz ping), 2015/09/15 12:55:59]

Add a comment explaining why base::Unretained() is safe here.

[Lalit Maganti, 2015/09/15 14:19:25]

Done.

+                 id_,
+                 requesting_frame_,
+                 embedder_);
+
   switch (type_) {
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       infobar_ = GeolocationInfoBarDelegate::Create(
-          GetInfoBarService(id_), controller, id_, requesting_frame_,
-          display_languages);
+          GetInfoBarService(id_), id_, requesting_frame_,
+          display_languages, callback);
       break;
 #if defined(ENABLE_NOTIFICATIONS)
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
       infobar_ = NotificationPermissionInfobarDelegate::Create(
-          GetInfoBarService(id_), controller, id_, requesting_frame_,
-          display_languages);
+          GetInfoBarService(id_), id_, requesting_frame_,
+          display_languages, callback);
       break;
 #endif  // ENABLE_NOTIFICATIONS
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
       infobar_ = MidiPermissionInfoBarDelegate::Create(
-          GetInfoBarService(id_), controller, id_, requesting_frame_,
-          display_languages, type_);
+          GetInfoBarService(id_), id_, requesting_frame_,
+          display_languages, type_, callback);
       break;
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
     case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
       infobar_ = ProtectedMediaIdentifierInfoBarDelegate::Create(
-          GetInfoBarService(id_), controller, id_, requesting_frame_,
-          display_languages);
+          GetInfoBarService(id_), id_, requesting_frame_,
+          display_languages, callback);
       break;
 #endif
     case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE:
       infobar_ = DurableStoragePermissionInfoBarDelegate::Create(
-          GetInfoBarService(id_), controller, id_, requesting_frame_,
-          display_languages, type_);
+          GetInfoBarService(id_), id_, requesting_frame_,
+          display_languages, type_, callback);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 
 PermissionQueueController::PermissionQueueController(Profile* profile,
                                                      ContentSettingsType type)
@@ skipping 242 matching lines @@
       ContentSettingsPattern::Wildcard() :
       ContentSettingsPattern::FromURLNoWildcard(embedder.GetOrigin());
 
   profile_->GetHostContentSettingsMap()->SetContentSetting(
       ContentSettingsPattern::FromURLNoWildcard(requesting_frame.GetOrigin()),
       embedder_pattern,
       type_,
       std::string(),
       content_setting);
 }