chrome/browser/content_settings/host_content_settings_map.h - Issue 648653003: Standardize usage of virtual/override/final in chrome/browser/

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/content_settings/host_content_settings_map.h

Issue 648653003: Standardize usage of virtual/override/final in chrome/browser/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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

« no previous file with comments | « chrome/browser/content_settings/cookie_settings.h ('k') | chrome/browser/content_settings/local_shared_objects_container.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/host_content_settings_map.h

diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h

index 9316b6f07c657aff4dc06f5df8011ee27cf68660..efd3f99155f2f2677a7ed143ad2a3246ccb56084 100644

--- a/chrome/browser/content_settings/host_content_settings_map.h

+++ b/chrome/browser/content_settings/host_content_settings_map.h

@@ -193,11 +193,10 @@ class HostContentSettingsMap

void ShutdownOnUIThread();

// content_settings::Observer implementation.

- virtual void OnContentSettingChanged(

- const ContentSettingsPattern& primary_pattern,

- const ContentSettingsPattern& secondary_pattern,

- ContentSettingsType content_type,

- std::string resource_identifier) override;

+ void OnContentSettingChanged(const ContentSettingsPattern& primary_pattern,

+ const ContentSettingsPattern& secondary_pattern,

+ ContentSettingsType content_type,

+ std::string resource_identifier) override;

// Returns true if we should allow all content types for this URL. This is

// true for various internal objects like chrome:// URLs, so UI and other

@@ -293,7 +292,7 @@ class HostContentSettingsMap

typedef ProviderMap::iterator ProviderIterator;

typedef ProviderMap::const_iterator ConstProviderIterator;

- virtual ~HostContentSettingsMap();

+ ~HostContentSettingsMap() override;

ContentSetting GetDefaultContentSettingFromProvider(

ContentSettingsType content_type,