diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-05 22:47:27 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-05 22:47:27 +0000 |
| commit | 388dd3a1688b3af37e804966fadfe83e6d46abc9 (patch) | |
| tree | 35ece93cfa05154f7e3d542db2f4a0e03b4c804e /chrome/common/chrome_paths.cc | |
| parent | 018cf36471451716c1fa14b99d7b2bbf780c883d (diff) | |
| download | chromium_src-388dd3a1688b3af37e804966fadfe83e6d46abc9.zip chromium_src-388dd3a1688b3af37e804966fadfe83e6d46abc9.tar.gz chromium_src-388dd3a1688b3af37e804966fadfe83e6d46abc9.tar.bz2 | |
Make disabled internal plugins stay disabled even when the version of Chrome changes.
This change is a bit hacky, but the proper change is to re-factor the plugins
stuff (and such a change wouldn't be M5-able).
BUG=42393
TEST=On Chrome with this CL, disable internal Flash. Update Chrome to a newer version (also with this CL). Check that internal Flash remains disabled. (Or hack the prefs file to test manually....)
Review URL: http://codereview.chromium.org/1969007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_paths.cc')
| -rw-r--r-- | chrome/common/chrome_paths.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index aefcebc..6a6c232 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -192,6 +192,10 @@ bool PathProvider(int key, FilePath* result) { cur = cur.Append(FILE_PATH_LITERAL("Temp")); create_dir = true; break; + case chrome::DIR_INTERNAL_PLUGINS: + if (!GetInternalPluginsDirectory(&cur)) + return false; + break; case chrome::FILE_LOCAL_STATE: if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; |