diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-14 22:28:12 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-14 22:28:12 +0000 |
| commit | 3e08799bb8167e74988e84ccf17eaa922c66ff95 (patch) | |
| tree | d5408e3945c69033a567bf71b68b17686fa3b300 /chrome/browser/browser_main.cc | |
| parent | e06375ed7728a9d8f4725aa8ff0253b97c0de63d (diff) | |
| download | chromium_src-3e08799bb8167e74988e84ccf17eaa922c66ff95.zip chromium_src-3e08799bb8167e74988e84ccf17eaa922c66ff95.tar.gz chromium_src-3e08799bb8167e74988e84ccf17eaa922c66ff95.tar.bz2 | |
first-run: Eliminate the ifdefs in upgrade_util.h
BUG=79203
TEST=None
R=jhawkins@chromium.org
Review URL: http://codereview.chromium.org/6853022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81659 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 560dcc4..faa2335 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -124,11 +124,26 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #endif +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#include "chrome/browser/first_run/upgrade_util_linux.h" +#endif + #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/boot_times_loader.h" #include "chrome/browser/chromeos/brightness_observer.h" #include "chrome/browser/chromeos/system_key_event_listener.h" +#include "chrome/browser/chromeos/cros/cros_library.h" +#include "chrome/browser/chromeos/cros/screen_lock_library.h" +#include "chrome/browser/chromeos/customization_document.h" +#include "chrome/browser/chromeos/external_metrics.h" +#include "chrome/browser/chromeos/login/authenticator.h" +#include "chrome/browser/chromeos/login/login_utils.h" +#include "chrome/browser/chromeos/login/ownership_service.h" +#include "chrome/browser/chromeos/login/screen_locker.h" +#include "chrome/browser/chromeos/login/user_manager.h" +#include "chrome/browser/chromeos/metrics_cros_settings_provider.h" #include "chrome/browser/oom_priority_manager.h" +#include "chrome/browser/ui/views/browser_dialogs.h" #endif // TODO(port): several win-only methods have been pulled out of this, but @@ -145,6 +160,7 @@ #include "base/win/windows_version.h" #include "chrome/browser/browser_trial.h" #include "chrome/browser/first_run/try_chrome_dialog_view.h" +#include "chrome/browser/first_run/upgrade_util_win.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/rlz/rlz.h" @@ -174,20 +190,6 @@ #endif #endif -#if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/cros/cros_library.h" -#include "chrome/browser/chromeos/cros/screen_lock_library.h" -#include "chrome/browser/chromeos/customization_document.h" -#include "chrome/browser/chromeos/external_metrics.h" -#include "chrome/browser/chromeos/login/authenticator.h" -#include "chrome/browser/chromeos/login/login_utils.h" -#include "chrome/browser/chromeos/login/ownership_service.h" -#include "chrome/browser/chromeos/login/screen_locker.h" -#include "chrome/browser/chromeos/login/user_manager.h" -#include "chrome/browser/chromeos/metrics_cros_settings_provider.h" -#include "chrome/browser/ui/views/browser_dialogs.h" -#endif - #if defined(TOOLKIT_USES_GTK) #include "ui/gfx/gtk_util.h" #endif |