Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: chrome/installer/setup/install.cc

Issue 1223953003: Introduce UpdateActiveSetupVersionWorkItem (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_active_setup_onosup_addCB_API
Patch Set: Do not support negative values (operate on unsigned ints) Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 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 <windows.h> 7 #include <windows.h>
8 #include <shlobj.h> 8 #include <shlobj.h>
9 #include <time.h> 9 #include <time.h>
10 10
(...skipping 18 matching lines...) Expand all
29 #include "chrome/installer/util/browser_distribution.h" 29 #include "chrome/installer/util/browser_distribution.h"
30 #include "chrome/installer/util/create_reg_key_work_item.h" 30 #include "chrome/installer/util/create_reg_key_work_item.h"
31 #include "chrome/installer/util/delete_after_reboot_helper.h" 31 #include "chrome/installer/util/delete_after_reboot_helper.h"
32 #include "chrome/installer/util/google_update_constants.h" 32 #include "chrome/installer/util/google_update_constants.h"
33 #include "chrome/installer/util/helper.h" 33 #include "chrome/installer/util/helper.h"
34 #include "chrome/installer/util/install_util.h" 34 #include "chrome/installer/util/install_util.h"
35 #include "chrome/installer/util/master_preferences.h" 35 #include "chrome/installer/util/master_preferences.h"
36 #include "chrome/installer/util/master_preferences_constants.h" 36 #include "chrome/installer/util/master_preferences_constants.h"
37 #include "chrome/installer/util/set_reg_value_work_item.h" 37 #include "chrome/installer/util/set_reg_value_work_item.h"
38 #include "chrome/installer/util/shell_util.h" 38 #include "chrome/installer/util/shell_util.h"
39 #include "chrome/installer/util/update_active_setup_version_work_item.h"
grt (UTC plus 2) 2015/07/09 14:23:53 nit: move into 1223933005
gab 2015/07/09 20:36:37 Oops, done.
39 #include "chrome/installer/util/util_constants.h" 40 #include "chrome/installer/util/util_constants.h"
40 #include "chrome/installer/util/work_item_list.h" 41 #include "chrome/installer/util/work_item_list.h"
41 42
42 43
43 namespace { 44 namespace {
44 45
45 void LogShortcutOperation(ShellUtil::ShortcutLocation location, 46 void LogShortcutOperation(ShellUtil::ShortcutLocation location,
46 BrowserDistribution* dist, 47 BrowserDistribution* dist,
47 const ShellUtil::ShortcutProperties& properties, 48 const ShellUtil::ShortcutProperties& properties,
48 ShellUtil::ShortcutOperation operation, 49 ShellUtil::ShortcutOperation operation,
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 // Read master_preferences copied beside chrome.exe at install. 656 // Read master_preferences copied beside chrome.exe at install.
656 MasterPreferences prefs(installation_root.AppendASCII(kDefaultMasterPrefs)); 657 MasterPreferences prefs(installation_root.AppendASCII(kDefaultMasterPrefs));
657 base::FilePath chrome_exe(installation_root.Append(kChromeExe)); 658 base::FilePath chrome_exe(installation_root.Append(kChromeExe));
658 CreateOrUpdateShortcuts( 659 CreateOrUpdateShortcuts(
659 chrome_exe, chrome, prefs, CURRENT_USER, install_operation); 660 chrome_exe, chrome, prefs, CURRENT_USER, install_operation);
660 661
661 UpdateDefaultBrowserBeaconForPath(chrome_exe); 662 UpdateDefaultBrowserBeaconForPath(chrome_exe);
662 } 663 }
663 664
664 } // namespace installer 665 } // namespace installer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698