diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 21:58:41 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 21:58:41 +0000 |
| commit | d1572f4a4eddfb0a94e6548c8987aa76f75a2863 (patch) | |
| tree | 493ec32f3a3bb7484c06e6db34c28024e73b9c62 /chrome/installer/setup/install.cc | |
| parent | 7086d56e3fde7f710347d7f58ee998a901754744 (diff) | |
| download | chromium_src-d1572f4a4eddfb0a94e6548c8987aa76f75a2863.zip chromium_src-d1572f4a4eddfb0a94e6548c8987aa76f75a2863.tar.gz chromium_src-d1572f4a4eddfb0a94e6548c8987aa76f75a2863.tar.bz2 | |
cleanup
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/install.cc')
| -rw-r--r-- | chrome/installer/setup/install.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc index 8d6a4db..ba62f0c 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -7,13 +7,11 @@ #include "chrome/installer/setup/install.h" -#include "base/command_line.h" #include "base/file_util.h" +#include "base/logging.h" #include "base/path_service.h" #include "base/registry.h" #include "base/scoped_ptr.h" -#include "base/string_util.h" -#include "chrome/common/chrome_constants.h" #include "chrome/installer/setup/setup_constants.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/create_reg_key_work_item.h" @@ -24,8 +22,6 @@ #include "chrome/installer/util/set_reg_value_work_item.h" #include "chrome/installer/util/shell_util.h" #include "chrome/installer/util/util_constants.h" -#include "chrome/installer/util/work_item.h" -#include "chrome/installer/util/version.h" #include "chrome/installer/util/work_item_list.h" // Build-time generated include file. @@ -486,7 +482,7 @@ installer_util::InstallStatus installer::InstallOrUpdateChrome( const std::wstring& exe_path, const std::wstring& archive_path, const std::wstring& install_temp_path, const DictionaryValue* prefs, const Version& new_version, const Version* installed_version) { - bool system_install = installer_util::GetBooleanPreference(prefs, + bool system_install = installer_util::GetDistroBooleanPreference(prefs, installer_util::master_preferences::kSystemLevel); std::wstring install_path(GetChromeInstallPath(system_install)); if (install_path.empty()) { @@ -528,9 +524,9 @@ installer_util::InstallStatus installer::InstallOrUpdateChrome( result = installer_util::NEW_VERSION_UPDATED; } - bool create_all_shortcut = installer_util::GetBooleanPreference(prefs, + bool create_all_shortcut = installer_util::GetDistroBooleanPreference(prefs, installer_util::master_preferences::kCreateAllShortcuts); - bool alt_shortcut = installer_util::GetBooleanPreference(prefs, + bool alt_shortcut = installer_util::GetDistroBooleanPreference(prefs, installer_util::master_preferences::kAltShortcutText); if (!CreateOrUpdateChromeShortcuts(exe_path, install_path, new_version.GetString(), result, @@ -540,7 +536,7 @@ installer_util::InstallStatus installer::InstallOrUpdateChrome( RemoveOldVersionDirs(install_path, new_version.GetString()); - bool make_chrome_default = installer_util::GetBooleanPreference(prefs, + bool make_chrome_default = installer_util::GetDistroBooleanPreference(prefs, installer_util::master_preferences::kMakeChromeDefault); RegisterChromeOnMachine(install_path, system_install, make_chrome_default); } |