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..0cd7704892fb1f4a95eb8bbe45915d37e16f1b9b 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(ENABLED_EXTENSIONS) |
Jun Mukai
2014/09/22 05:53:16
ENABLE_EXTENSIONS
not ENABLED
Jitu( very slow this week)
2014/09/22 05:56:57
Done.
Thanks
|
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 = |