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

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

Issue 796543002: Plugin Power Saver: Implement option in Settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: restore 'ask' to list of allowed settings for policy settings Created 6 years 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.cc
diff --git a/chrome/browser/ui/website_settings/website_settings_ui.cc b/chrome/browser/ui/website_settings/website_settings_ui.cc
index 21d7f6494a3e725ec3be777e54b6d1bd2c2e4d4f..4d9e4710cff00bbf3041b00c77a75d1d564487b5 100644
--- a/chrome/browser/ui/website_settings/website_settings_ui.cc
+++ b/chrome/browser/ui/website_settings/website_settings_ui.cc
@@ -18,12 +18,12 @@ const int kInvalidResourceID = -1;
// The resource id's for the strings that are displayed on the permissions
// button if the permission setting is managed by policy.
const int kPermissionButtonTextIDPolicyManaged[] = {
- kInvalidResourceID,
- IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_POLICY,
- IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_POLICY,
- kInvalidResourceID,
- kInvalidResourceID
-};
+ kInvalidResourceID,
+ IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_POLICY,
+ IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_POLICY,
+ kInvalidResourceID,
+ kInvalidResourceID,
+ kInvalidResourceID};
COMPILE_ASSERT(arraysize(kPermissionButtonTextIDPolicyManaged) ==
CONTENT_SETTING_NUM_SETTINGS,
button_text_id_array_size_incorrect);
@@ -31,12 +31,12 @@ COMPILE_ASSERT(arraysize(kPermissionButtonTextIDPolicyManaged) ==
// The resource id's for the strings that are displayed on the permissions
// button if the permission setting is managed by an extension.
const int kPermissionButtonTextIDExtensionManaged[] = {
- kInvalidResourceID,
- IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_EXTENSION,
- IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_EXTENSION,
- kInvalidResourceID,
- kInvalidResourceID
-};
+ kInvalidResourceID,
+ IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_EXTENSION,
+ IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_EXTENSION,
+ kInvalidResourceID,
+ kInvalidResourceID,
+ kInvalidResourceID};
COMPILE_ASSERT(arraysize(kPermissionButtonTextIDExtensionManaged) ==
CONTENT_SETTING_NUM_SETTINGS,
button_text_id_array_size_incorrect);
@@ -44,12 +44,12 @@ COMPILE_ASSERT(arraysize(kPermissionButtonTextIDExtensionManaged) ==
// The resource id's for the strings that are displayed on the permissions
// button if the permission setting is managed by the user.
const int kPermissionButtonTextIDUserManaged[] = {
- kInvalidResourceID,
- IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_USER,
- IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_USER,
- kInvalidResourceID,
- kInvalidResourceID
-};
+ kInvalidResourceID,
+ IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_USER,
+ IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_USER,
+ kInvalidResourceID,
+ kInvalidResourceID,
+ kInvalidResourceID};
COMPILE_ASSERT(arraysize(kPermissionButtonTextIDUserManaged) ==
CONTENT_SETTING_NUM_SETTINGS,
button_text_id_array_size_incorrect);
@@ -57,12 +57,12 @@ COMPILE_ASSERT(arraysize(kPermissionButtonTextIDUserManaged) ==
// The resource id's for the strings that are displayed on the permissions
// button if the permission setting is the global default setting.
const int kPermissionButtonTextIDDefaultSetting[] = {
- kInvalidResourceID,
- IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_DEFAULT,
- IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_DEFAULT,
- IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ASK_BY_DEFAULT,
- kInvalidResourceID
-};
+ kInvalidResourceID,
+ IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_DEFAULT,
+ IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_DEFAULT,
+ IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ASK_BY_DEFAULT,
+ kInvalidResourceID,
+ kInvalidResourceID};
COMPILE_ASSERT(arraysize(kPermissionButtonTextIDDefaultSetting) ==
CONTENT_SETTING_NUM_SETTINGS,
button_text_id_array_size_incorrect);

Powered by Google App Engine
This is Rietveld 408576698