diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 14:58:55 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 14:58:55 +0000 |
| commit | bc4303d3eeb937a6ad851f364d9fa36ea40dc26b (patch) | |
| tree | f7f0e826f891d1f5200a28539668c8fdbe41e2bb /chrome/chrome_browser.gypi | |
| parent | b68d96cf5d2b0628ebd8db90b51883c381868aa6 (diff) | |
| download | chromium_src-bc4303d3eeb937a6ad851f364d9fa36ea40dc26b.zip chromium_src-bc4303d3eeb937a6ad851f364d9fa36ea40dc26b.tar.gz chromium_src-bc4303d3eeb937a6ad851f364d9fa36ea40dc26b.tar.bz2 | |
Move more stuff out of browser_init.cc.
Move all startup prompts into chrome/browser/ui/startup.
Move ChromeOS profile init to chrome/browser/chromeos
http://crbug.com/127307
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10356065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136300 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index ec9731e..aa78019 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -803,6 +803,8 @@ 'browser/chromeos/process_proxy/process_proxy.h', 'browser/chromeos/process_proxy/process_proxy_registry.cc', 'browser/chromeos/process_proxy/process_proxy_registry.h', + 'browser/chromeos/profile_startup.cc', + 'browser/chromeos/profile_startup.h', 'browser/chromeos/proxy_config_service_impl.cc', 'browser/chromeos/proxy_config_service_impl.h', 'browser/chromeos/proxy_cros_settings_parser.cc', @@ -2273,9 +2275,6 @@ 'browser/ui/app_modal_dialogs/message_box_handler.cc', 'browser/ui/app_modal_dialogs/message_box_handler.h', 'browser/ui/app_modal_dialogs/native_app_modal_dialog.h', - 'browser/ui/autolaunch_prompt.cc', - 'browser/ui/autolaunch_prompt_win.cc', - 'browser/ui/autolaunch_prompt.h', 'browser/ui/auto_login_info_bar_delegate.cc', 'browser/ui/auto_login_info_bar_delegate.h', 'browser/ui/auto_login_prompter.cc', @@ -2787,8 +2786,6 @@ 'browser/ui/crypto_module_password_dialog.h', 'browser/ui/crypto_module_password_dialog_nss.cc', 'browser/ui/crypto_module_password_dialog_openssl.cc', - 'browser/ui/default_browser_prompt.cc', - 'browser/ui/default_browser_prompt.h', 'browser/ui/extensions/shell_window.cc', 'browser/ui/extensions/shell_window.h', 'browser/ui/find_bar/find_bar.h', @@ -3157,6 +3154,18 @@ 'browser/ui/select_file_dialog.h', 'browser/ui/snapshot_tab_helper.cc', 'browser/ui/snapshot_tab_helper.h', + 'browser/ui/startup/autolaunch_prompt.cc', + 'browser/ui/startup/autolaunch_prompt_win.cc', + 'browser/ui/startup/autolaunch_prompt.h', + 'browser/ui/startup/bad_flags_prompt.cc', + 'browser/ui/startup/bad_flags_prompt.h', + 'browser/ui/startup/default_browser_prompt.cc', + 'browser/ui/startup/default_browser_prompt.h', + 'browser/ui/startup/obsolete_os_prompt.cc', + 'browser/ui/startup/obsolete_os_prompt.h', + 'browser/ui/startup/obsolete_os_prompt_gtk.cc', + 'browser/ui/startup/session_crashed_prompt.cc', + 'browser/ui/startup/session_crashed_prompt.h', 'browser/ui/status_bubble.h', 'browser/ui/sync/browser_synced_window_delegate.h', 'browser/ui/sync/browser_synced_window_delegate.cc', @@ -4424,6 +4433,9 @@ ], }], ], + 'sources!': [ + 'browser/ui/startup/obsolete_os_prompt.cc', + ], }], ['input_speech==0', { 'sources/': [ @@ -4729,9 +4741,9 @@ 'browser/ui/browser_list_stub.cc', 'browser/ui/certificate_dialogs.cc', 'browser/ui/certificate_dialogs.h', - 'browser/ui/autolaunch_prompt.cc', 'browser/ui/crypto_module_password_dialog.cc', 'browser/ui/crypto_module_password_dialog_nss.cc', + 'browser/ui/startup/autolaunch_prompt.cc', 'browser/ui/views/keyboard_overlay_delegate.cc', 'browser/ui/views/keyboard_overlay_dialog_view.cc', 'browser/ui/views/simple_message_box_views.cc', |