diff options
| author | dfalcantara@chromium.org <dfalcantara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 10:19:34 +0000 |
|---|---|---|
| committer | dfalcantara@chromium.org <dfalcantara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 10:19:34 +0000 |
| commit | 52348b2e09e06b88e1caa2cb29843acaaaaa53cf (patch) | |
| tree | 1764f207b8110c4c4e77aaea81c2fe838c2b3892 /content | |
| parent | 05b47d5346281d7c899063fa9eda604f5c466431 (diff) | |
| download | chromium_src-52348b2e09e06b88e1caa2cb29843acaaaaa53cf.zip chromium_src-52348b2e09e06b88e1caa2cb29843acaaaaa53cf.tar.gz chromium_src-52348b2e09e06b88e1caa2cb29843acaaaaa53cf.tar.bz2 | |
Avoid watching for plugin updates on Android
Chrome doesn't support plugins on Android, so we shouldn't monitor the plugins
directory for any new ones that appear.
BUG=159063
Review URL: https://chromiumcodereview.appspot.com/11364106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/plugin_service_impl.cc | 8 | ||||
| -rw-r--r-- | content/browser/plugin_service_impl.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc index 2f81ed0..dabd26d 100644 --- a/content/browser/plugin_service_impl.cc +++ b/content/browser/plugin_service_impl.cc @@ -40,7 +40,7 @@ #include "content/browser/plugin_loader_posix.h" #endif -#if defined(OS_POSIX) && !defined(OS_OPENBSD) +#if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID) using ::base::files::FilePathWatcher; #endif @@ -71,7 +71,7 @@ static void NotifyPluginsOfActivation() { iter->OnAppActivation(); } #endif -#if defined(OS_POSIX) && !defined(OS_OPENBSD) +#if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID) // Delegate class for monitoring directories. class PluginDirWatcherDelegate : public FilePathWatcher::Delegate { virtual void OnFilePathChanged(const FilePath& path) OVERRIDE { @@ -182,7 +182,7 @@ void PluginServiceImpl::StartWatchingPlugins() { } } #endif -#if defined(OS_POSIX) && !defined(OS_OPENBSD) +#if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID) // On ChromeOS the user can't install plugins anyway and on Windows all // important plugins register themselves in the registry so no need to do that. file_watcher_delegate_ = new PluginDirWatcherDelegate(); @@ -594,7 +594,7 @@ PepperPluginInfo* PluginServiceImpl::GetRegisteredPpapiPluginInfo( return &ppapi_plugins_[ppapi_plugins_.size() - 1]; } -#if defined(OS_POSIX) && !defined(OS_OPENBSD) +#if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID) // static void PluginServiceImpl::RegisterFilePathWatcher( FilePathWatcher* watcher, diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h index 6bca392..9c4d501 100644 --- a/content/browser/plugin_service_impl.h +++ b/content/browser/plugin_service_impl.h @@ -32,7 +32,7 @@ #include "base/win/registry.h" #endif -#if defined(OS_POSIX) && !defined(OS_OPENBSD) +#if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID) #include "base/files/file_path_watcher.h" #endif @@ -202,7 +202,7 @@ class CONTENT_EXPORT PluginServiceImpl const FilePath& plugin_path, PluginProcessHost::Client* client); -#if defined(OS_POSIX) && !defined(OS_OPENBSD) +#if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID) // Registers a new FilePathWatcher for a given path. static void RegisterFilePathWatcher( base::files::FilePathWatcher* watcher, @@ -223,7 +223,7 @@ class CONTENT_EXPORT PluginServiceImpl base::WaitableEventWatcher hklm_watcher_; #endif -#if defined(OS_POSIX) && !defined(OS_OPENBSD) +#if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID) ScopedVector<base::files::FilePathWatcher> file_watchers_; scoped_refptr<PluginDirWatcherDelegate> file_watcher_delegate_; #endif |