Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(338)

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 492703003: Adding the code inside extension flag to avoid build breaks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 2b2296228b8d7094a36622a9306a02ffb97b78fd..bbef3eb858e9f126276d807b60f3e93917ccf265 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1803,10 +1803,11 @@ void ChromeContentBrowserClient::RequestDesktopNotificationPermission(
// permission, the user will still be prompted.)
Profile* profile = Profile::FromBrowserContext(
render_frame_host->GetSiteInstance()->GetBrowserContext());
- InfoMap* extension_info_map =
- extensions::ExtensionSystem::Get(profile)->info_map();
DesktopNotificationService* notification_service =
DesktopNotificationServiceFactory::GetForProfile(profile);
+#if defined(ENABLE_EXTENSIONS)
+ InfoMap* extension_info_map =
+ extensions::ExtensionSystem::Get(profile)->info_map();
const Extension* extension = NULL;
if (extension_info_map) {
extensions::ExtensionSet extensions;
@@ -1831,6 +1832,7 @@ void ChromeContentBrowserClient::RequestDesktopNotificationPermission(
callback.Run(blink::WebNotificationPermissionAllowed);
return;
}
+#endif
WebContents* web_contents = WebContents::FromRenderFrameHost(
render_frame_host);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698