chrome/browser/sessions/tab_restore_service.cc - Issue 6544023: Fix crashes in ExtensionService

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/sessions/tab_restore_service.cc

Issue 6544023: Fix crashes in ExtensionService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add comment/TODO Created 9 years, 10 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:

Index: chrome/browser/sessions/tab_restore_service.cc

diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc

index c4f3ae4ecbaf536ae7a65422f56937124fe45509..7d32607e810fe2c8686f475cb8aa06139b59bb5c 100644

--- a/chrome/browser/sessions/tab_restore_service.cc

+++ b/chrome/browser/sessions/tab_restore_service.cc

@@ -155,7 +155,10 @@ void RemoveEntryByID(SessionID::id_type id,

void RecordAppLaunch(Browser* browser, const TabRestoreService::Tab& tab) {

GURL url = tab.navigations.at(tab.current_navigation_index).virtual_url();

Profile* profile = browser->profile();

- if (!profile->GetExtensionService()->IsInstalledApp(url))

+ // TODO: the ExtensionService should never be NULL, but in some cases it is,

+ // see bug 73768. After it is resolved, the explicit test can go away.

+ ExtensionService* service = profile->GetExtensionService();

+ if (!service || !service->IsInstalledApp(url))

return;

UMA_HISTOGRAM_ENUMERATION(extension_misc::kAppLaunchHistogram,

« no previous file with comments | « chrome/browser/sessions/session_restore.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »