chrome/browser/media_galleries/media_galleries_preferences.cc - Issue 16910002: Destroy StorageMonitorCros before DBusServices (take 2)

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/media_galleries/media_galleries_preferences.cc

Issue 16910002: Destroy StorageMonitorCros before DBusServices (take 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 6 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/media_galleries/media_galleries_preferences.cc

diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc

index c297798ca9cfa714b3aa131bd7e49c2ea8712bb5..76bff782fe163f31e90ec92e8be6b8739b6d15b8 100644

--- a/chrome/browser/media_galleries/media_galleries_preferences.cc

+++ b/chrome/browser/media_galleries/media_galleries_preferences.cc

@@ -262,7 +262,8 @@ MediaGalleriesPreferences::MediaGalleriesPreferences(Profile* profile)

}

MediaGalleriesPreferences::~MediaGalleriesPreferences() {

- StorageMonitor::GetInstance()->RemoveObserver(this);

+ if (StorageMonitor::GetInstance())

Greg Billock 2013/06/13 14:55:31 This should merge out now since it was in the othe

+ StorageMonitor::GetInstance()->RemoveObserver(this);

}

void MediaGalleriesPreferences::AddDefaultGalleriesIfFreshProfile() {

« no previous file with comments | « chrome/browser/media_galleries/media_galleries_dialog_controller.cc ('k') | no next file » | no next file with comments »