| Index: chrome/browser/ui/content_settings/content_setting_bubble_model.h
|
| diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.h b/chrome/browser/ui/content_settings/content_setting_bubble_model.h
|
| index 10bd07d9ba9888b7b4b00c322fcb871d90a15085..165b372b388aea205bc0e4c076556ee9acfb7ab8 100644
|
| --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.h
|
| +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.h
|
| @@ -45,9 +45,9 @@ class RapporServiceImpl;
|
| // ContentSettingRPHBubbleModel - protocol handlers
|
| // ContentSettingMidiSysExBubbleModel - midi sysex
|
| // ContentSettingDomainListBubbleModel - domain list (geolocation)
|
| +// ContentSettingPluginBubbleModel - plugins
|
| // ContentSettingSingleRadioGroup - radio group
|
| // ContentSettingCookiesBubbleModel - cookies
|
| -// ContentSettingPluginBubbleModel - plugins
|
| // ContentSettingPopupBubbleModel - popups
|
| // ContentSettingSubresourceFilterBubbleModel - filtered subresources
|
|
|
| @@ -228,12 +228,6 @@ class ContentSettingBubbleModel : public content::NotificationObserver {
|
| void set_selected_device(const content::MediaStreamDevice& device) {
|
| bubble_content_.media_menus[device.type].selected_device = device;
|
| }
|
| - bool setting_is_managed() {
|
| - return setting_is_managed_;
|
| - }
|
| - void set_setting_is_managed(bool managed) {
|
| - setting_is_managed_ = managed;
|
| - }
|
| rappor::RapporServiceImpl* rappor_service() const { return rappor_service_; }
|
|
|
| private:
|
| @@ -246,9 +240,6 @@ class ContentSettingBubbleModel : public content::NotificationObserver {
|
| BubbleContent bubble_content_;
|
| // A registrar for listening for WEB_CONTENTS_DESTROYED notifications.
|
| content::NotificationRegistrar registrar_;
|
| - // A flag that indicates if the content setting managed i.e. can't be
|
| - // controlled by the user.
|
| - bool setting_is_managed_;
|
| // The service used to record Rappor metrics. Can be set for testing.
|
| rappor::RapporServiceImpl* rappor_service_;
|
|
|
|
|