diff options
| author | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-31 00:21:27 +0000 |
|---|---|---|
| committer | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-31 00:21:27 +0000 |
| commit | d19921bf3f89589fafea8321d5119463bd9f173b (patch) | |
| tree | 1d53473c3b01d163a356014fdfa063cb6df772eb /chrome/browser/browser_main.cc | |
| parent | f211befbc09c492a5c882fd4f08d71a69ea7c1fa (diff) | |
| download | chromium_src-d19921bf3f89589fafea8321d5119463bd9f173b.zip chromium_src-d19921bf3f89589fafea8321d5119463bd9f173b.tar.gz chromium_src-d19921bf3f89589fafea8321d5119463bd9f173b.tar.bz2 | |
Rollback 8998
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 0898d44..5d2b149 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -20,9 +20,6 @@ #include "base/values.h" #include "chrome/app/result_codes.h" #include "chrome/browser/browser_main_win.h" -#include "chrome/browser/browser_init.h" -#include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_prefs.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/plugin_service.h" #include "chrome/browser/profile_manager.h" @@ -59,6 +56,9 @@ #include "base/win_util.h" #include "chrome/browser/automation/automation_provider.h" #include "chrome/browser/browser.h" +#include "chrome/browser/browser_init.h" +#include "chrome/browser/browser_list.h" +#include "chrome/browser/browser_prefs.h" #include "chrome/browser/browser_process_impl.h" #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/browser_trial.h" @@ -547,7 +547,8 @@ int BrowserMain(const MainFunctionParams& parameters) { if (parameters.ui_task) { MessageLoopForUI::current()->PostTask(FROM_HERE, parameters.ui_task); RunUIMessageLoop(browser_process.get()); - } else if (BrowserInit::ProcessCommandLine(std::wstring(), local_state, true, + } else if (BrowserInit::ProcessCommandLine(parsed_command_line, + std::wstring(), local_state, true, profile, &result_code)) { RunUIMessageLoop(browser_process.get()); } |