diff options
| author | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-31 20:18:52 +0000 |
|---|---|---|
| committer | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-31 20:18:52 +0000 |
| commit | a814d863440f0a154a7299f2d8b440f405c7700e (patch) | |
| tree | 9aa8723a4c235299da0f17dbef32f89e0d3a91ac /chrome/browser/browser_main.cc | |
| parent | 3dc08620970265dcca2b0d79ef9325d25a0b647b (diff) | |
| download | chromium_src-a814d863440f0a154a7299f2d8b440f405c7700e.zip chromium_src-a814d863440f0a154a7299f2d8b440f405c7700e.tar.gz chromium_src-a814d863440f0a154a7299f2d8b440f405c7700e.tar.bz2 | |
Re-land this changelist to make BrowserInit work on Mac.
R=pinkerton,brettw
Review URL: http://codereview.chromium.org/19528
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9019 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, 4 insertions, 5 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 5d2b149..0898d44 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -20,6 +20,9 @@ #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" @@ -56,9 +59,6 @@ #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,8 +547,7 @@ 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(parsed_command_line, - std::wstring(), local_state, true, + } else if (BrowserInit::ProcessCommandLine(std::wstring(), local_state, true, profile, &result_code)) { RunUIMessageLoop(browser_process.get()); } |