chrome/browser/extensions/api/media_galleries/media_galleries_api.h - Issue 14556015: [Media Galleries] Lazily initialize the storage monitor.

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.h

Issue 14556015: [Media Galleries] Lazily initialize the storage monitor. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

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

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

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

index 528994d56984ff9cae56ede346f9176fa31e2d40..5e53984e8b3f68f75787a47443142a23c9f14bc8 100644

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

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

@@ -12,6 +12,9 @@

#include "chrome/browser/extensions/extension_function.h"

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

+#include "chrome/common/extensions/api/media_galleries.h"

+namespace MediaGalleries = extensions::api::media_galleries;

namespace extensions {

@@ -26,6 +29,10 @@ class MediaGalleriesGetMediaFileSystemsFunction

virtual bool RunImpl() OVERRIDE;

private:

+ // Bottom half for RunImpl, invoked after the storage monitor is initialized.

+ void OnStorageMonitorInit(

+ MediaGalleries::GetMediaFileSystemsInteractivity interactive);

// Always show the dialog.

void AlwaysShowDialog(

const std::vector<chrome::MediaFileSystemInfo>& filesystems);