diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 16:34:17 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 16:34:17 +0000 |
| commit | 3b48dbc794dd45719eb6047968eb1946d39fe59e (patch) | |
| tree | 61cdc08668739748a0a2de3aa5e582b2b7c4a92c /content/browser/plugin_service_impl.h | |
| parent | 67edf3b5a450c34ded10e67783500376248ba85e (diff) | |
| download | chromium_src-3b48dbc794dd45719eb6047968eb1946d39fe59e.zip chromium_src-3b48dbc794dd45719eb6047968eb1946d39fe59e.tar.gz chromium_src-3b48dbc794dd45719eb6047968eb1946d39fe59e.tar.bz2 | |
Automatically load newly installed plug-ins if they are missing on a page.
To enable this on Mac OS, we also enable plug-in directory watching there. There shouldn't be any false positives causing unnecessary disk hits anymore.
BUG=62079
TEST=go to http://www.corp.google.com/~bauerb/no_crawl/test/install_plugin.html, install the missing plug-in. It should automatically load.
Review URL: http://codereview.chromium.org/9015025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_service_impl.h')
| -rw-r--r-- | content/browser/plugin_service_impl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h index b106edd..4a2c203 100644 --- a/content/browser/plugin_service_impl.h +++ b/content/browser/plugin_service_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -31,7 +31,7 @@ #include "base/win/registry.h" #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) +#if defined(OS_POSIX) && !defined(OS_OPENBSD) #include "base/files/file_path_watcher.h" #endif @@ -189,7 +189,7 @@ class CONTENT_EXPORT PluginServiceImpl const FilePath& plugin_path, PluginProcessHost::Client* client); -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) +#if defined(OS_POSIX) && !defined(OS_OPENBSD) // Registers a new FilePathWatcher for a given path. static void RegisterFilePathWatcher( base::files::FilePathWatcher* watcher, @@ -215,7 +215,7 @@ class CONTENT_EXPORT PluginServiceImpl base::WaitableEventWatcher hklm_watcher_; #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) +#if defined(OS_POSIX) && !defined(OS_OPENBSD) ScopedVector<base::files::FilePathWatcher> file_watchers_; scoped_refptr<PluginDirWatcherDelegate> file_watcher_delegate_; #endif |