chrome/browser/ui/views/website_settings/website_settings_popup_view.cc - Issue 1441143006: Disable Notifications in Incognito

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

Issue 1441143006: Disable Notifications in Incognito (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@innoinherit

Patch Set: Clean up DecidePermission override, and prevent Page Info Bubble enabling permission. Created 5 years, 1 month 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

« chrome/browser/notifications/notification_permission_context.cc ('K') | « chrome/browser/ui/views/website_settings/permission_selector_view.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

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 07868e039bf6d4b714c496078c20b92e4b631065..ddb98063a24d3a2ef95718d7b85d91e5bdecd207 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

@@ -609,6 +609,8 @@ void WebsiteSettingsPopupView::SetPermissionInfo(

CreateSection(headline, permissions_content_, nullptr);

permissions_tab_->AddChildView(permissions_section);

+ bool is_incognito = web_contents_->GetBrowserContext()->IsOffTheRecord();

const int content_column = 0;

views::ColumnSet* column_set = layout->AddColumnSet(content_column);

column_set->AddColumn(views::GridLayout::FILL,

@@ -624,7 +626,7 @@ void WebsiteSettingsPopupView::SetPermissionInfo(

layout->StartRow(1, content_column);

PermissionSelectorView* selector = new PermissionSelectorView(

web_contents_ ? web_contents_->GetURL() : GURL::EmptyGURL(),

- *permission);

+ *permission, is_incognito);

mlamouri (slow - plz ping) 2015/11/28 17:00:54 nit: could you simply call web_contents->GetBrowse

johnme 2015/11/30 15:37:20 Done.

selector->AddObserver(this);

layout->AddView(selector,