Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/installer/setup/install.h" | 5 #include "chrome/installer/setup/install.h" |
| 6 | 6 |
| 7 #include <shlobj.h> | 7 #include <shlobj.h> |
| 8 #include <time.h> | 8 #include <time.h> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| (...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 415 | 415 |
| 416 if (result == FIRST_INSTALL_SUCCESS) { | 416 if (result == FIRST_INSTALL_SUCCESS) { |
| 417 installer_state.UpdateStage(installer::CONFIGURE_AUTO_LAUNCH); | 417 installer_state.UpdateStage(installer::CONFIGURE_AUTO_LAUNCH); |
| 418 | 418 |
| 419 // Add auto-launch key if specified in master preferences. | 419 // Add auto-launch key if specified in master preferences. |
| 420 bool auto_launch_chrome = false; | 420 bool auto_launch_chrome = false; |
| 421 prefs.GetBool( | 421 prefs.GetBool( |
| 422 installer::master_preferences::kAutoLaunchChrome, | 422 installer::master_preferences::kAutoLaunchChrome, |
| 423 &auto_launch_chrome); | 423 &auto_launch_chrome); |
| 424 if (auto_launch_chrome) { | 424 if (auto_launch_chrome) { |
| 425 FilePath path = | |
| 426 chrome_install->GetUserDataPath().AppendASCII("Default"); | |
|
grt (UTC plus 2)
2012/02/01 18:45:15
#include "chrome/common/chrome_constants.h"
"Defau
| |
| 425 auto_launch_util::SetWillLaunchAtLogin( | 427 auto_launch_util::SetWillLaunchAtLogin( |
| 426 true, installer_state.target_path()); | 428 true, installer_state.target_path(), |
|
grt (UTC plus 2)
2012/02/01 18:45:15
nit: move |path| up to this line
| |
| 429 path); | |
| 427 } | 430 } |
| 428 } | 431 } |
| 429 } | 432 } |
| 430 | 433 |
| 431 installer_state.UpdateStage(installer::REMOVING_OLD_VERSIONS); | 434 installer_state.UpdateStage(installer::REMOVING_OLD_VERSIONS); |
| 432 | 435 |
| 433 installer_state.RemoveOldVersionDirectories( | 436 installer_state.RemoveOldVersionDirectories( |
| 434 new_version, | 437 new_version, |
| 435 existing_version.get(), | 438 existing_version.get(), |
| 436 install_temp_path); | 439 install_temp_path); |
| 437 } | 440 } |
| 438 | 441 |
| 439 return result; | 442 return result; |
| 440 } | 443 } |
| 441 | 444 |
| 442 } // namespace installer | 445 } // namespace installer |
| OLD | NEW |