| Index: chrome/browser/plugins/plugin_utils.h
|
| diff --git a/chrome/browser/plugins/plugin_utils.h b/chrome/browser/plugins/plugin_utils.h
|
| index 6c8d6fe1b57682f3b1398417e2beae6d430594af..59fc174927466ebdbbd8a2cd77ed2a47dc5ee1fd 100644
|
| --- a/chrome/browser/plugins/plugin_utils.h
|
| +++ b/chrome/browser/plugins/plugin_utils.h
|
| @@ -10,6 +10,7 @@
|
|
|
| class GURL;
|
| class HostContentSettingsMap;
|
| +struct PermissionResult;
|
|
|
| namespace content {
|
| struct WebPluginInfo;
|
| @@ -29,13 +30,13 @@ class PluginUtils {
|
| const url::Origin& main_frame_origin,
|
| const GURL& plugin_url,
|
| const std::string& resource,
|
| - ContentSetting* setting,
|
| + PermissionResult* setting,
|
| bool* is_default,
|
| bool* is_managed);
|
|
|
| // Returns the content setting for Flash. This is the same as
|
| // |GetPluginContentSetting| but flash-specific.
|
| - static ContentSetting GetFlashPluginContentSetting(
|
| + static PermissionResult GetFlashPluginContentSetting(
|
| const HostContentSettingsMap* host_content_settings_map,
|
| const url::Origin& main_frame_origin,
|
| const GURL& plugin_url,
|
|
|