chrome/browser/chrome_content_browser_client.cc - Issue 582673002: Fixed Build breaks while notification is enabled and extension is disabled.

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/chrome_content_browser_client.cc

Issue 582673002: Fixed Build breaks while notification is enabled and extension is disabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixed the comments Created 6 years, 3 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 | « no previous file | chrome/browser/notifications/desktop_notification_service.h » ('j') | chrome/browser/notifications/desktop_notification_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index b05f8bb43e9cb0a5af59a5f50aca782e2e3a8900..7ba071b26d78c2c608cd27cf1c24b79c1800d0cc 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -1865,6 +1865,7 @@ ChromeContentBrowserClient::CheckDesktopNotificationPermission(

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));

ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);

+#if defined(ENABLE_EXTENSIONS)

InfoMap* extension_info_map = io_data->GetExtensionInfoMap();

// We want to see if there is an extension that hasn't been manually disabled

@@ -1882,6 +1883,7 @@ ChromeContentBrowserClient::CheckDesktopNotificationPermission(

if (!extension_info_map->AreNotificationsDisabled((*iter)->id()))

return blink::WebNotificationPermissionAllowed;

}

+#endif

// No enabled extensions exist, so check the normal host content settings.

HostContentSettingsMap* host_content_settings_map =

« no previous file with comments | « no previous file | chrome/browser/notifications/desktop_notification_service.h » ('j') | chrome/browser/notifications/desktop_notification_service.h » ('J')