Decouple MediaStreamInfoBarDelegate from GroupedPermissionInfoBarDelegate

chrome/browser/permissions/permission_infobar_delegate.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_PERMISSIONS_PERMISSION_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_PERMISSIONS_PERMISSION_INFOBAR_DELEGATE_H_
 
 #include <memory>

[dominickn, 2016/09/20 08:01:36]

Nit: #include <vector>

[lshang, 2016/09/21 03:47:39]

Done.

 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "content/public/browser/permission_type.h"
 
 class Profile;
 
 // Base class for permission infobars, it implements the default behavior
 // so that the accept/deny buttons grant/deny the relevant permission.
 // A basic implementor only needs to implement the methods that
 // provide an icon and a message text to the infobar.
 class PermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
 
  public:
   using PermissionSetCallback = base::Callback<void(bool, PermissionAction)>;
 
   ~PermissionInfoBarDelegate() override;
-  ContentSettingsType content_setting() const { return content_settings_type_; }
+  virtual std::vector<int> content_setting() const;
 
   // Returns true if the infobar should display a toggle to allow users to
   // opt-out of persisting their accept/deny decision.
-  bool ShouldShowPersistenceToggle() const;
+  virtual bool ShouldShowPersistenceToggle() const;

[dominickn, 2016/09/20 08:01:36]

Should this be made virtual, or should you just check the MIC and CAMERA content
settings types (like it does for geolocation right now)? That may be cleaner.

[lshang, 2016/09/21 03:47:39]

Good idea, have merged two media types into ShouldShowPersistenceToggle() of
parent class PermissionInfoBarDelegate.

Done.

 
   // Sets whether or not a decided permission should be persisted to content
   // settings.
   void set_persist(bool persist) { persist_ = persist; }
 
   // ConfirmInfoBarDelegate:
   base::string16 GetMessageText() const override;
 
  protected:
   PermissionInfoBarDelegate(const GURL& requesting_origin,
@@ skipping 25 matching lines @@
   bool persist_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionInfoBarDelegate);
 };
 
 // Implemented in platform-specific code.
 std::unique_ptr<infobars::InfoBar> CreatePermissionInfoBar(
     std::unique_ptr<PermissionInfoBarDelegate> delegate);
 
 #endif  // CHROME_BROWSER_PERMISSIONS_PERMISSION_INFOBAR_DELEGATE_H_