Chromium Code Reviews| Index: chrome/browser/ui/webui/options/content_settings_handler.h |
| diff --git a/chrome/browser/ui/webui/options/content_settings_handler.h b/chrome/browser/ui/webui/options/content_settings_handler.h |
| index 0123f3f509bd7badd117738e8ebc61857dbd41f1..9557bc98e04f96101032158b9eb2b8feca426c0f 100644 |
| --- a/chrome/browser/ui/webui/options/content_settings_handler.h |
| +++ b/chrome/browser/ui/webui/options/content_settings_handler.h |
| @@ -10,6 +10,7 @@ |
| #include "base/memory/scoped_ptr.h" |
| #include "base/prefs/pref_change_registrar.h" |
| #include "base/scoped_observer.h" |
| +#include "base/values.h" |
| #include "chrome/browser/pepper_flash_settings_manager.h" |
| #include "chrome/browser/ui/webui/options/options_ui.h" |
| #include "chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h" |
| @@ -224,6 +225,10 @@ class ContentSettingsHandler : public OptionsPageUIHandler, |
| void RefreshFlashMediaSettings(); |
| + // Returns exceptions constructed from the policy-set allowed URLs |
| + // for the content settings |type| mic or camera. |
| + base::ListValue* GetPolicyAllowedUrls(ContentSettingsType type); |
|
Bernhard Bauer
2015/07/28 13:06:49
Return this as scoped_ptr?
msramek
2015/07/28 15:05:38
Done. Also change GetExceptionForPage() et al. to
|
| + |
| // Fills in |exceptions| with Values for the given |type| from |map|. |
| void GetExceptionsFromHostContentSettingsMap( |
| const HostContentSettingsMap* map, |