diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 22:17:29 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 22:17:29 +0000 |
| commit | fc14cef961fa421cc1c44e373e3f3f0fb84ec545 (patch) | |
| tree | b7f442cf807c187103f4340c9aa9a0b37e3c94d6 /chrome/browser/browser_main.cc | |
| parent | 933fbfb3a9813625eea8c2258748ce86210444a8 (diff) | |
| download | chromium_src-fc14cef961fa421cc1c44e373e3f3f0fb84ec545.zip chromium_src-fc14cef961fa421cc1c44e373e3f3f0fb84ec545.tar.gz chromium_src-fc14cef961fa421cc1c44e373e3f3f0fb84ec545.tar.bz2 | |
Move MessageWindow out into its own file. BrowserInit is now cross-platform-capable.
Fix up the header includes in browser_init.cc/h removing a bunch of windows stuff.
Review URL: http://codereview.chromium.org/19034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 63cba36..8431d5d 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -65,12 +65,15 @@ #include "chrome/browser/extensions/extension_protocols.h" #include "chrome/browser/first_run.h" #include "chrome/browser/jankometer.h" +#include "chrome/browser/message_window.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/dns_global.h" #include "chrome/browser/net/sdch_dictionary_fetcher.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/printing/print_job_manager.h" +#include "chrome/browser/profile.h" +#include "chrome/browser/profile_manager.h" #include "chrome/browser/rlz/rlz.h" #include "chrome/browser/user_data_manager.h" #include "chrome/browser/views/user_data_dir_dialog.h" @@ -214,7 +217,7 @@ int BrowserMain(const MainFunctionParams& parameters) { std::wstring user_data_dir; PathService::Get(chrome::DIR_USER_DATA, &user_data_dir); - BrowserInit::MessageWindow message_window(user_data_dir); + MessageWindow message_window(user_data_dir); scoped_ptr<BrowserProcess> browser_process; if (parsed_command_line.HasSwitch(switches::kImport)) { |