chrome/browser/extensions/api/media_galleries/media_galleries_api.cc - Issue 24269007: Media Galleries API: Fix MediaGalleriesPreferences finders race.

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/extensions/api/media_galleries/media_galleries_api.cc

Issue 24269007: Media Galleries API: Fix MediaGalleriesPreferences finders race. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 3 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/extensions/api/media_galleries/media_galleries_api.h ('k') | chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc » ('j') | chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

index 42a6b49ea98ead71d125304e540125c8ba4d1785..d7d247710437fdc93a5ce13de9649f9f0061ce77 100644

--- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

@@ -20,6 +20,7 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/media_galleries/media_file_system_registry.h"

#include "chrome/browser/media_galleries/media_galleries_dialog_controller.h"

+#include "chrome/browser/media_galleries/media_galleries_preferences.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/storage_monitor/storage_monitor.h"

#include "chrome/browser/ui/chrome_select_file_policy.h"

@@ -91,14 +92,18 @@ bool MediaGalleriesGetMediaFileSystemsFunction::RunImpl() {

interactive = params->details->interactive;

}

- StorageMonitor::GetInstance()->EnsureInitialized(base::Bind(

- &MediaGalleriesGetMediaFileSystemsFunction::OnStorageMonitorInit,

+ Profile* profile = Profile::FromBrowserContext(

+ render_view_host()->GetProcess()->GetBrowserContext());

+ MediaGalleriesPreferences* preferences =

+ g_browser_process->media_file_system_registry()->GetPreferences(profile);

+ preferences->EnsureInitialized(base::Bind(

+ &MediaGalleriesGetMediaFileSystemsFunction::OnPreferencesInit,

this,

interactive));

return true;

}

-void MediaGalleriesGetMediaFileSystemsFunction::OnStorageMonitorInit(

+void MediaGalleriesGetMediaFileSystemsFunction::OnPreferencesInit(

MediaGalleries::GetMediaFileSystemsInteractivity interactive) {

switch (interactive) {

case MediaGalleries::GET_MEDIA_FILE_SYSTEMS_INTERACTIVITY_YES: {