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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 383803003: Fixed a crash when extensions are not enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 14511ccb2f4e6338d19183360e97712d99f0743c..d42f7ab4a2efc2176a2025a9933627f47f7dfb34 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2513,8 +2513,11 @@ bool ChromeContentBrowserClient::AllowPepperSocketAPI(
Profile* profile = Profile::FromBrowserContext(browser_context);
const extensions::ExtensionSet* extension_set = NULL;
if (profile) {
- extension_set = extensions::ExtensionSystem::Get(profile)->
- extension_service()->extensions();
+ const ExtensionService* ext_service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
+ if (ext_service) {
+ extension_set = ext_service->extensions();
+ }
}
if (private_api) {
@@ -2733,8 +2736,11 @@ bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
Profile* profile = Profile::FromBrowserContext(browser_context);
const extensions::ExtensionSet* extension_set = NULL;
if (profile) {
- extension_set = extensions::ExtensionSystem::Get(profile)->
- extension_service()->extensions();
+ const ExtensionService* ext_service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
+ if (ext_service) {
+ extension_set = ext_service->extensions();
+ }
}
return IsExtensionOrSharedModuleWhitelisted(url, extension_set,
allowed_file_handle_origins_) ||
@@ -2758,8 +2764,11 @@ bool ChromeContentBrowserClient::IsPluginAllowedToUseDevChannelAPIs(
Profile* profile = Profile::FromBrowserContext(browser_context);
const extensions::ExtensionSet* extension_set = NULL;
if (profile) {
- extension_set = extensions::ExtensionSystem::Get(profile)->
- extension_service()->extensions();
+ const ExtensionService* ext_service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
+ if (ext_service) {
+ extension_set = ext_service->extensions();
+ }
}
// Allow access for whitelisted applications.
« 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