diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 00:49:34 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 00:49:34 +0000 |
| commit | f1933791ead4e0c44066287396f0475e95a2e1e3 (patch) | |
| tree | b9c6ef28cfdf0ad22d19327f2cdc5463ba4cd782 /chrome/browser/browser_process_impl.cc | |
| parent | 5d93738d664767ee0c7d3f0de8e5f68100de0b54 (diff) | |
| download | chromium_src-f1933791ead4e0c44066287396f0475e95a2e1e3.zip chromium_src-f1933791ead4e0c44066287396f0475e95a2e1e3.tar.gz chromium_src-f1933791ead4e0c44066287396f0475e95a2e1e3.tar.bz2 | |
Get rid of the following dependencies from content:
chrome/common/chrome_constants.h
chrome/common/chrome_paths.h
chrome/common/logging_chrome.h
BUG=76697
Review URL: http://codereview.chromium.org/7104144
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88935 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 3c4b52e..771f67e 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -766,6 +766,16 @@ void BrowserProcessImpl::CreateIOThread() { webkit::npapi::PluginList::Singleton()->AddExtraPluginPath(path); } +#if defined(OS_POSIX) + // Also find plugins in a user-specific plugins dir, + // e.g. ~/.config/chromium/Plugins. + FilePath user_data_dir; + if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) { + webkit::npapi::PluginList::Singleton()->AddExtraPluginDir( + user_data_dir.Append("Plugins")); + } +#endif + scoped_ptr<IOThread> thread(new IOThread( local_state(), net_log_.get(), extension_event_router_forwarder_.get())); base::Thread::Options options; |