chrome/browser/extensions/api/media_galleries/media_galleries_api.cc - Issue 10823193: Move MediaGalleries.getMediaFileSystems back to experimental for M22

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 10823193: Move MediaGalleries.getMediaFileSystems back to experimental for M22 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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') | no next file with comments »
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 0aa3eb0cccd5a461856b49933992d30c4eb992c2..f9ba21422adf22cac30a6079fc36d64d0d17b1d8 100644

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

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

@@ -13,7 +13,6 @@

#include "base/values.h"

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

#include "chrome/common/extensions/api/experimental_media_galleries.h"

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

#include "content/public/browser/child_process_security_policy.h"

#include "content/public/browser/render_process_host.h"

#include "content/public/browser/render_view_host.h"

@@ -33,7 +32,7 @@ const char kInvalidInteractive[] = "Unknown value for interactive.";

using chrome::MediaFileSystemRegistry;

using content::ChildProcessSecurityPolicy;

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

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

namespace GetMediaFileSystems = MediaGalleries::GetMediaFileSystems;

MediaGalleriesGetMediaFileSystemsFunction::