diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-05 20:17:19 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-05 20:17:19 +0000 |
| commit | 2ee3da9d6c75aa8633fa2458891eeb91d1632db3 (patch) | |
| tree | ff85013149ac4cfd6b86580e3f5470e1af1b42d7 /chrome/browser/chrome_content_browser_client.cc | |
| parent | 467c84d36d90b6328a13c6757ff336e1936773f4 (diff) | |
| download | chromium_src-2ee3da9d6c75aa8633fa2458891eeb91d1632db3.zip chromium_src-2ee3da9d6c75aa8633fa2458891eeb91d1632db3.tar.gz chromium_src-2ee3da9d6c75aa8633fa2458891eeb91d1632db3.tar.bz2 | |
Restore previous null checks to ChromeContentBrowserClient.
BUG=164223
TEST=Start Chrome with --site-per-process or --enable-strict-site-isolation
Review URL: https://chromiumcodereview.appspot.com/11441004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171294 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_content_browser_client.cc')
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index eadba8b..a188c1c 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -635,7 +635,7 @@ GURL ChromeContentBrowserClient::GetEffectiveURL( // installed app, the effective URL is an extension URL with the ID of that // extension as the host. This has the effect of grouping apps together in // a common SiteInstance. - ExtensionService* extension_service = + ExtensionService* extension_service = !profile ? NULL : extensions::ExtensionSystem::Get(profile)->extension_service(); if (!extension_service) return url; @@ -664,7 +664,7 @@ bool ChromeContentBrowserClient::ShouldUseProcessPerSite( return false; Profile* profile = Profile::FromBrowserContext(browser_context); - ExtensionService* extension_service = + ExtensionService* extension_service = !profile ? NULL : extensions::ExtensionSystem::Get(profile)->extension_service(); if (!extension_service) return false; @@ -736,7 +736,7 @@ bool ChromeContentBrowserClient::ShouldTryToUseExistingProcessHost( return false; Profile* profile = Profile::FromBrowserContext(browser_context); - ExtensionService* service = + ExtensionService* service = !profile ? NULL : extensions::ExtensionSystem::Get(profile)->extension_service(); if (!service) return false; @@ -1789,7 +1789,7 @@ bool ChromeContentBrowserClient::AllowPepperSocketAPI( Profile* profile = Profile::FromBrowserContext(browser_context); const Extension* extension = NULL; - ExtensionService* extension_service = + ExtensionService* extension_service = !profile ? NULL : extensions::ExtensionSystem::Get(profile)->extension_service(); if (extension_service) { extension = extension_service->extensions()-> |