Disable Web Notifications in Incognito
Requests for notifications (and hence push messaging) permissions in
incognito will be auto-denied after a random 1-2 second delay.
This prevents websites from detecting incognito mode, by observing
that notifications are available in incognito but push messaging is not
(until https://crbug.com/401439 is implemented).
Depends on:
- https://codereview.chromium.org/1442083002
Known caveat: Prevents legitimate use of notifications in incognito :(
BUG=479679,542081
Review URL: https://codereview.chromium.org/1575623002
Cr-Commit-Position: refs/heads/master@{#369644}
diff --git a/chrome/browser/ui/cocoa/website_settings/permission_selector_button_unittest.mm b/chrome/browser/ui/cocoa/website_settings/permission_selector_button_unittest.mm
index 10690b21..bb3f8d27 100644
--- a/chrome/browser/ui/cocoa/website_settings/permission_selector_button_unittest.mm
+++ b/chrome/browser/ui/cocoa/website_settings/permission_selector_button_unittest.mm
@@ -25,6 +25,7 @@
test_info.type = kTestPermissionType;
test_info.setting = CONTENT_SETTING_BLOCK;
test_info.source = content_settings::SETTING_SOURCE_USER;
+ test_info.is_incognito = false;
GURL test_url("http://www.google.com");
PermissionMenuModel::ChangeCallback callback = base::Bind(
&PermissionSelectorButtonTest::Callback, base::Unretained(this));
diff --git a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm
index 7f32a38b..a19897b4 100644
--- a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm
@@ -1355,6 +1355,8 @@
WebsiteSettingsUI::PermissionInfo info;
info.type = CONTENT_SETTINGS_TYPE_COOKIES;
info.setting = CONTENT_SETTING_ALLOW;
+ // info.default_setting, info.source, and info.is_incognito have not been set,
+ // but GetPermissionIcon doesn't use any of those.
NSImage* image = WebsiteSettingsUI::GetPermissionIcon(info).ToNSImage();
NSImageView* imageView = [self addImageWithSize:[image size]
toView:cookiesView_
diff --git a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm
index e8a5140f..b602bc61 100644
--- a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm
@@ -224,6 +224,7 @@
if (info.setting == CONTENT_SETTING_DEFAULT)
info.default_setting = kTestDefaultSettings[i];
info.source = kTestSettingSources[i];
+ info.is_incognito = false;
permission_info_list.push_back(info);
}
ChosenObjectInfoList chosen_object_info_list;
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
index fd8a371..65fd94f 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
@@ -590,6 +590,9 @@
WebsiteSettingsUI::PermissionInfo info;
info.type = CONTENT_SETTINGS_TYPE_COOKIES;
info.setting = CONTENT_SETTING_ALLOW;
+ info.is_incognito =
+ Profile::FromBrowserContext(web_contents_->GetBrowserContext())
+ ->IsOffTheRecord();
views::ImageView* icon = new views::ImageView();
const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(info);
icon->SetImage(image.ToImageSkia());
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc
index 33b3939..2dbffee 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc
+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc
@@ -161,6 +161,7 @@
PermissionInfoList list(1);
list.back().type = CONTENT_SETTINGS_TYPE_GEOLOCATION;
list.back().source = content_settings::SETTING_SOURCE_USER;
+ list.back().is_incognito = false;
EXPECT_EQ(0, api_->permissions_content()->child_count());
diff --git a/chrome/browser/ui/website_settings/permission_bubble_manager.cc b/chrome/browser/ui/website_settings/permission_bubble_manager.cc
index 0c657f2..50f2a4f 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_manager.cc
+++ b/chrome/browser/ui/website_settings/permission_bubble_manager.cc
@@ -110,6 +110,9 @@
.IsSameOriginWith(url::Origin(request->GetRequestingHostname()));
// Don't re-add an existing request or one with a duplicate text request.
+ // TODO(johnme): Instead of dropping duplicate requests, we should queue them
+ // and eventually run their PermissionGranted/PermissionDenied/Cancelled
+ // callback (crbug.com/577313).
bool same_object = false;
if (ExistingRequest(request, requests_, &same_object) ||
ExistingRequest(request, queued_requests_, &same_object) ||
diff --git a/chrome/browser/ui/website_settings/permission_menu_model.cc b/chrome/browser/ui/website_settings/permission_menu_model.cc
index 9f63ee575..7a6ff0d 100644
--- a/chrome/browser/ui/website_settings/permission_menu_model.cc
+++ b/chrome/browser/ui/website_settings/permission_menu_model.cc
@@ -58,11 +58,16 @@
permission_.type == CONTENT_SETTINGS_TYPE_MOUSELOCK) &&
url.SchemeIsFile();
+ // Notifications does not support CONTENT_SETTING_ALLOW in incognito.
+ bool allow_disabled_for_notifications =
+ permission_.is_incognito &&
+ permission_.type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
// Media only supports CONTENT_SETTTING_ALLOW for secure origins.
bool is_media_permission =
permission_.type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
permission_.type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;
- if ((!is_media_permission || content::IsOriginSecure(url)) &&
+ if (!allow_disabled_for_notifications &&
+ (!is_media_permission || content::IsOriginSecure(url)) &&
!is_exclusive_access_on_file) {
label = l10n_util::GetStringUTF16(
IDS_WEBSITE_SETTINGS_MENU_ITEM_ALLOW);
diff --git a/chrome/browser/ui/website_settings/permission_menu_model_unittest.cc b/chrome/browser/ui/website_settings/permission_menu_model_unittest.cc
index 747e2e3..718f108 100644
--- a/chrome/browser/ui/website_settings/permission_menu_model_unittest.cc
+++ b/chrome/browser/ui/website_settings/permission_menu_model_unittest.cc
@@ -31,6 +31,7 @@
permission.type = CONTENT_SETTINGS_TYPE_COOKIES;
permission.setting = CONTENT_SETTING_ALLOW;
permission.default_setting = CONTENT_SETTING_ALLOW;
+ permission.is_incognito = false;
PermissionMenuModel model(
GURL("http://www.google.com"), permission, callback.callback());
EXPECT_EQ(3, model.GetItemCount());
@@ -45,6 +46,7 @@
permission.type = type;
permission.setting = CONTENT_SETTING_ALLOW;
permission.default_setting = CONTENT_SETTING_ALLOW;
+ permission.is_incognito = false;
PermissionMenuModel model(
GURL("http://www.google.com"), permission, callback.callback());
EXPECT_EQ(2, model.GetItemCount());
@@ -65,6 +67,7 @@
permission.type = CONTENT_SETTINGS_TYPE_FULLSCREEN;
permission.setting = CONTENT_SETTING_ASK;
permission.default_setting = CONTENT_SETTING_ASK;
+ permission.is_incognito = false;
PermissionMenuModel fullscreen_model(GURL("file:///test.html"), permission,
callback.callback());
EXPECT_EQ(1, fullscreen_model.GetItemCount());
@@ -80,3 +83,21 @@
l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ASK),
fullscreen_model.GetLabelAt(0));
}
+
+TEST(PermissionMenuModelTest, TestIncognitoNotifications) {
+ TestCallback callback;
+ WebsiteSettingsUI::PermissionInfo permission;
+ permission.type = CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
+ permission.setting = CONTENT_SETTING_ASK;
+ permission.default_setting = CONTENT_SETTING_ASK;
+
+ permission.is_incognito = false;
+ PermissionMenuModel regular_model(GURL("https://www.google.com"), permission,
+ callback.callback());
+ EXPECT_EQ(3, regular_model.GetItemCount());
+
+ permission.is_incognito = true;
+ PermissionMenuModel incognito_model(GURL("https://www.google.com"),
+ permission, callback.callback());
+ EXPECT_EQ(2, incognito_model.GetItemCount());
+}
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index dfc92c8..6f817da7 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -699,6 +699,7 @@
}
permission_info.source = info.source;
+ permission_info.is_incognito = profile_->IsOffTheRecord();
if (info.primary_pattern == ContentSettingsPattern::Wildcard() &&
info.secondary_pattern == ContentSettingsPattern::Wildcard()) {
diff --git a/chrome/browser/ui/website_settings/website_settings_ui.cc b/chrome/browser/ui/website_settings/website_settings_ui.cc
index 936e5bd..373792e4 100644
--- a/chrome/browser/ui/website_settings/website_settings_ui.cc
+++ b/chrome/browser/ui/website_settings/website_settings_ui.cc
@@ -124,8 +124,8 @@
: type(CONTENT_SETTINGS_TYPE_DEFAULT),
setting(CONTENT_SETTING_DEFAULT),
default_setting(CONTENT_SETTING_DEFAULT),
- source(content_settings::SETTING_SOURCE_NONE) {
-}
+ source(content_settings::SETTING_SOURCE_NONE),
+ is_incognito(false) {}
WebsiteSettingsUI::ChosenObjectInfo::ChosenObjectInfo(
const WebsiteSettings::ChooserUIInfo& ui_info,
diff --git a/chrome/browser/ui/website_settings/website_settings_ui.h b/chrome/browser/ui/website_settings/website_settings_ui.h
index f284630..0ea8943 100644
--- a/chrome/browser/ui/website_settings/website_settings_ui.h
+++ b/chrome/browser/ui/website_settings/website_settings_ui.h
@@ -73,6 +73,8 @@
ContentSetting default_setting;
// The settings source e.g. user, extensions, policy, ... .
content_settings::SettingSource source;
+ // Whether the profile is off the record.
+ bool is_incognito;
};
// |ChosenObjectInfo| contains information about a single |object| of a
