diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-02 16:50:58 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-02 16:50:58 +0000 |
| commit | 2290cb86f535d7babd4d84a2a08831404885e78c (patch) | |
| tree | 09bca698a3e1a66c14ff50771dee24cd5751c918 /chrome/plugin/plugin_main.cc | |
| parent | e9b3528e6a8d79f465fcdd2e44477f1eb9275539 (diff) | |
| download | chromium_src-2290cb86f535d7babd4d84a2a08831404885e78c.zip chromium_src-2290cb86f535d7babd4d84a2a08831404885e78c.tar.gz chromium_src-2290cb86f535d7babd4d84a2a08831404885e78c.tar.bz2 | |
Make webkit_glue not depend on default_plugin.
This removes a dependency cycle and should also make life easier for DRT.
Revert http://codereview.chromium.org/1658012
Review URL: http://codereview.chromium.org/2358001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48731 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin/plugin_main.cc')
| -rw-r--r-- | chrome/plugin/plugin_main.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc index 070cfd5..f2da7e3 100644 --- a/chrome/plugin/plugin_main.cc +++ b/chrome/plugin/plugin_main.cc @@ -15,6 +15,7 @@ #include "chrome/common/child_process.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/default_plugin.h" #include "chrome/common/gpu_plugin.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/main_function_params.h" @@ -128,6 +129,7 @@ int PluginMain(const MainFunctionParams& parameters) { } #endif + chrome::RegisterInternalDefaultPlugin(); chrome::RegisterInternalGPUPlugin(); MessageLoop::current()->Run(); |