| Index: chrome/browser/ui/website_settings/website_settings_ui.h
|
| diff --git a/chrome/browser/ui/website_settings/website_settings_ui.h b/chrome/browser/ui/website_settings/website_settings_ui.h
|
| index e9a32bb4e1d265718af3777209ed4b1e6916d778..c6a9d220a423aa264a555f2c60a624a26954a6f2 100644
|
| --- a/chrome/browser/ui/website_settings/website_settings_ui.h
|
| +++ b/chrome/browser/ui/website_settings/website_settings_ui.h
|
| @@ -58,6 +58,8 @@ class WebsiteSettingsUI {
|
| ContentSetting setting;
|
| // The global default settings for this permission |type|.
|
| ContentSetting default_setting;
|
| + // The settings source e.g. user, extensions, policy, ... .
|
| + content_settings::SettingSource source;
|
| };
|
|
|
| // |IdentityInfo| contains information about the site's identity and
|
| @@ -99,8 +101,10 @@ class WebsiteSettingsUI {
|
| // Returns the UI string describing the action taken for a permission,
|
| // including why that action was taken. E.g. "Allowed by you",
|
| // "Blocked by default".
|
| - static string16 PermissionActionToUIString(ContentSetting setting,
|
| - ContentSetting default_setting);
|
| + static string16 PermissionActionToUIString(
|
| + ContentSetting setting,
|
| + ContentSetting default_setting,
|
| + content_settings::SettingSource source);
|
|
|
| // Returns the icon for the given permission |type| and |setting|.
|
| static const gfx::Image& GetPermissionIcon(ContentSettingsType type,
|
|
|