Exclude media galleries from android chrome.
Android can no longer include media_galleries, as the MediaMountPointProvider and other fileapi mechanisms have now been moved to chrome/. android_webview cannot include anything from chrome/.
BUG=175936
Review URL: https://chromiumcodereview.appspot.com/14305008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195994 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 2c496d0..8821234 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -42,7 +42,6 @@
#include "chrome/browser/intranet_redirect_detector.h"
#include "chrome/browser/io_thread.h"
#include "chrome/browser/lifetime/application_lifetime.h"
-#include "chrome/browser/media_galleries/media_file_system_registry.h"
#include "chrome/browser/metrics/metrics_service.h"
#include "chrome/browser/metrics/thread_watcher.h"
#include "chrome/browser/metrics/variations/variations_service.h"
@@ -118,6 +117,10 @@
#include "chrome/browser/chromeos/memory/oom_priority_manager.h"
#endif // defined(OS_CHROMEOS)
+#if !defined(OS_ANDROID)
+#include "chrome/browser/media_galleries/media_file_system_registry.h"
+#endif
+
#if defined(ENABLE_PLUGIN_INSTALLATION)
#include "chrome/browser/plugins/plugins_resource_service.h"
#endif
@@ -630,9 +633,13 @@
chrome::MediaFileSystemRegistry*
BrowserProcessImpl::media_file_system_registry() {
+#if defined(OS_ANDROID)
+ return NULL;
+#else
if (!media_file_system_registry_)
media_file_system_registry_.reset(new chrome::MediaFileSystemRegistry());
return media_file_system_registry_.get();
+#endif
}
#if !defined(OS_WIN)
