diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 22:54:41 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 22:54:41 +0000 |
| commit | ab926d553d2fbab7f170826afa811a253a8a65c8 (patch) | |
| tree | 76c577b278544269f2ee04412b9661528d57856e /webkit/glue | |
| parent | 02e60209512e8013f962d33c0916613b796cad84 (diff) | |
| download | chromium_src-ab926d553d2fbab7f170826afa811a253a8a65c8.zip chromium_src-ab926d553d2fbab7f170826afa811a253a8a65c8.tar.gz chromium_src-ab926d553d2fbab7f170826afa811a253a8a65c8.tar.bz2 | |
Deprecate PathService::Get(..., wstring*) and use FilePath instead.
I tried fixing all the Windows code but there's a *ton* of it.
This change will at least prevent people from adding new code that
uses the deprecated version (as that won't compile on Lin/Mac).
BUG=24672
Review URL: http://codereview.chromium.org/293013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/plugins/plugin_list_win.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/webkit/glue/plugins/plugin_list_win.cc b/webkit/glue/plugins/plugin_list_win.cc index 9576238..bdf4b07 100644 --- a/webkit/glue/plugins/plugin_list_win.cc +++ b/webkit/glue/plugins/plugin_list_win.cc @@ -121,10 +121,12 @@ void GetFirefoxDirectory(std::set<FilePath>* plugin_dirs) { GetPluginsInRegistryDirectory( HKEY_LOCAL_MACHINE, kRegistryMozillaPlugins, plugin_dirs); - std::wstring firefox_app_data_plugin_path; + FilePath firefox_app_data_plugin_path; if (PathService::Get(base::DIR_APP_DATA, &firefox_app_data_plugin_path)) { - firefox_app_data_plugin_path += L"\\Mozilla\\plugins"; - plugin_dirs->insert(FilePath(firefox_app_data_plugin_path)); + firefox_app_data_plugin_path = + firefox_app_data_plugin_path.AppendASCII("Mozilla") + .AppendASCII("plugins"); + plugin_dirs->insert(firefox_app_data_plugin_path); } } |