chrome/browser/media_galleries/media_galleries_dialog_controller.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_dialog_controller.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/browser/media_galleries/media_galleries_preferences.cc » ('j') | chrome/browser/media_galleries/media_galleries_preferences.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/media_galleries_dialog_controller.cc

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

index 962e1dbc3124142cc84e78d78881a170e50f1b06..b823c649b3101cd4059d94ff0743a611addf80af 100644

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

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

@@ -126,7 +126,8 @@ MediaGalleriesDialogController::MediaGalleriesDialogController()

preferences_(NULL) {}

MediaGalleriesDialogController::~MediaGalleriesDialogController() {

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

+ if (chrome::StorageMonitor::GetInstance())

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

if (select_folder_dialog_.get())

select_folder_dialog_->ListenerDestroyed();