diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 21:39:54 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 21:39:54 +0000 |
| commit | fe2e0acc986f9b12b34abeb536da98848fbfb8ba (patch) | |
| tree | 9ff592c6f25c7fc4f90c7cb4a994a6f4c1974ac0 /content/shell/shell_browser_main.cc | |
| parent | 83c318ac743ef51c843aefd2b5d09ff0c8f347f8 (diff) | |
| download | chromium_src-fe2e0acc986f9b12b34abeb536da98848fbfb8ba.zip chromium_src-fe2e0acc986f9b12b34abeb536da98848fbfb8ba.tar.gz chromium_src-fe2e0acc986f9b12b34abeb536da98848fbfb8ba.tar.bz2 | |
Fix content_shell. We really need an automated test soon :)
Review URL: http://codereview.chromium.org/8742029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_browser_main.cc')
| -rw-r--r-- | content/shell/shell_browser_main.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc index 324139e..9bb1408 100644 --- a/content/shell/shell_browser_main.cc +++ b/content/shell/shell_browser_main.cc @@ -12,6 +12,7 @@ #include "content/browser/browser_process_sub_thread.h" #include "content/browser/download/download_file_manager.h" #include "content/browser/download/save_file_manager.h" +#include "content/browser/plugin_service.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/shell/shell.h" #include "content/shell/shell_browser_context.h" @@ -42,11 +43,12 @@ ShellBrowserMainParts::ShellBrowserMainParts( ShellBrowserMainParts::~ShellBrowserMainParts() { } -void ShellBrowserMainParts::PreCreateThreads() { +void ShellBrowserMainParts::PreMainMessageLoopRun() { browser_context_.reset(new ShellBrowserContext(this)); Shell::PlatformInitialize(); net::NetModule::SetResourceProvider(Shell::PlatformResourceProvider); + PluginService::GetInstance()->Init(); Shell::CreateNewWindow(browser_context_.get(), GetStartupURL(), |