| Index: chrome/browser/plugins/plugin_utils.h
|
| diff --git a/chrome/browser/plugins/plugin_utils.h b/chrome/browser/plugins/plugin_utils.h
|
| index 3d1b691b86e5a5c982dd169053c6530093bfb73e..686eb2e20541a0a5e0986e714c018be4cb10d773 100644
|
| --- a/chrome/browser/plugins/plugin_utils.h
|
| +++ b/chrome/browser/plugins/plugin_utils.h
|
| @@ -15,6 +15,10 @@ namespace content {
|
| struct WebPluginInfo;
|
| }
|
|
|
| +namespace url {
|
| +class Origin;
|
| +}
|
| +
|
| class PluginUtils {
|
| public:
|
| // |is_default| and |is_managed| may be nullptr. In that case, they aren't
|
| @@ -22,7 +26,7 @@ class PluginUtils {
|
| static void GetPluginContentSetting(
|
| const HostContentSettingsMap* host_content_settings_map,
|
| const content::WebPluginInfo& plugin,
|
| - const GURL& policy_url,
|
| + const url::Origin& main_frame_origin,
|
| const GURL& plugin_url,
|
| const std::string& resource,
|
| ContentSetting* setting,
|
| @@ -33,7 +37,7 @@ class PluginUtils {
|
| // |GetPluginContentSetting| but flash-specific.
|
| static ContentSetting GetFlashPluginContentSetting(
|
| const HostContentSettingsMap* host_content_settings_map,
|
| - const GURL& policy_url,
|
| + const url::Origin& main_frame_origin,
|
| const GURL& plugin_url,
|
| bool* is_managed);
|
|
|
|
|