chrome/browser/ui/website_settings/website_settings.h - Issue 1317443002: Fix UAF in Origin Info Bubble and permission settings UI.

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/website_settings/website_settings.h

Issue 1317443002: Fix UAF in Origin Info Bubble and permission settings UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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

« chrome/browser/ui/views/website_settings/website_settings_popup_view.cc ('K') | « chrome/browser/ui/views/website_settings/website_settings_popup_view.cc ('k') | chrome/browser/ui/website_settings/website_settings_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/website_settings/website_settings.h

diff --git a/chrome/browser/ui/website_settings/website_settings.h b/chrome/browser/ui/website_settings/website_settings.h

index 0df464caf9d4394dc02b60f0e94d53692ac38d3b..f29fd858d01c269d126709cbb24289e6248dd74b 100644

--- a/chrome/browser/ui/website_settings/website_settings.h

+++ b/chrome/browser/ui/website_settings/website_settings.h

@@ -136,6 +136,8 @@ class WebsiteSettings : public TabSpecificContentSettings::SiteDataObserver {

// SiteDataObserver implementation.

void OnSiteDataAccessed() override;

+ void DoNotShowInfoBar() { show_info_bar_ = false; }

felt 2015/08/25 18:20:08 nit: should this be a setter for show_info_bar_ in

private:

// Initializes the |WebsiteSettings|.

void Init(Profile* profile,

@@ -152,9 +154,9 @@ class WebsiteSettings : public TabSpecificContentSettings::SiteDataObserver {

// in the |ui_|.

void PresentSiteIdentity();

- // The website settings UI displays information and controls for site

- // specific data (local stored objects like cookies), site specific

- // permissions (location, popup, plugin, etc. permissions) and site specific

+ // The website settings UI displays information and controls for site-

+ // specific data (local stored objects like cookies), site-specific

+ // permissions (location, pop-up, plugin, etc. permissions) and site-specific

// information (identity, connection status, etc.).

WebsiteSettingsUI* ui_;