Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6747)

Unified Diff: chrome/browser/ui/website_settings/website_settings_ui.h

Issue 10831128: (Views only) Disable drop-down buttons in the website settings popup for managed permissions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix mac build. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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,
« no previous file with comments | « chrome/browser/ui/website_settings/website_settings.cc ('k') | chrome/browser/ui/website_settings/website_settings_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698