| Index: chrome/browser/ui/views/website_settings/permission_selector_view.cc
|
| diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.cc b/chrome/browser/ui/views/website_settings/permission_selector_view.cc
|
| index c20dfcbfcb51b71aa81ed6c564efaf1a8197efc6..64550f721c512190b9efb4cb1e3072e934d43ac6 100644
|
| --- a/chrome/browser/ui/views/website_settings/permission_selector_view.cc
|
| +++ b/chrome/browser/ui/views/website_settings/permission_selector_view.cc
|
| @@ -10,6 +10,8 @@
|
| #include "chrome/browser/ui/website_settings/permission_menu_model.h"
|
| #include "chrome/browser/ui/website_settings/website_settings_ui.h"
|
| #include "chrome/grit/generated_resources.h"
|
| +#include "components/content_settings/core/browser/content_settings_info.h"
|
| +#include "components/content_settings/core/browser/content_settings_registry.h"
|
| #include "ui/accessibility/ax_view_state.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/gfx/image/image.h"
|
| @@ -124,7 +126,8 @@ void PermissionMenuButton::OnMenuButtonClicked(View* source,
|
|
|
| PermissionSelectorView::PermissionSelectorView(
|
| const GURL& url,
|
| - const WebsiteSettingsUI::PermissionInfo& permission)
|
| + const WebsiteSettingsUI::PermissionInfo& permission,
|
| + bool is_incognito)
|
| : icon_(NULL), menu_button_(NULL) {
|
| views::GridLayout* layout = new views::GridLayout(this);
|
| SetLayoutManager(layout);
|
| @@ -178,6 +181,17 @@ PermissionSelectorView::PermissionSelectorView(
|
| // Create the permission menu button.
|
| bool button_enabled =
|
| permission.source == content_settings::SETTING_SOURCE_USER;
|
| + if (is_incognito) {
|
| + const content_settings::ContentSettingsInfo* info =
|
| + content_settings::ContentSettingsRegistry::GetInstance()->Get(
|
| + permission.type);
|
| + if (info &&
|
| + info->incognito_behavior() == content_settings::ContentSettingsInfo::
|
| + DENY_IN_INCOGNITO_AFTER_DELAY) {
|
| + // This permission is disabled in incognito. Don't let user enable it.
|
| + button_enabled = false;
|
| + }
|
| + }
|
| menu_button_ = new internal::PermissionMenuButton(
|
| WebsiteSettingsUI::PermissionActionToUIString(
|
| permission.type, permission.setting, permission.default_setting,
|
|
|