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

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

Issue 159618: Use alternate icon for Chrome shortcuts if specified in master preferences. (Closed)
Patch Set: fix merge errors Created 11 years, 4 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
« no previous file with comments | « chrome/browser/first_run_win.cc ('k') | chrome/installer/setup/install.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 // This file contains the specification of setup main functions. 5 // This file contains the specification of setup main functions.
6 6
7 #ifndef CHROME_INSTALLER_SETUP_INSTALL_H_ 7 #ifndef CHROME_INSTALLER_SETUP_INSTALL_H_
8 #define CHROME_INSTALLER_SETUP_INSTALL_H_ 8 #define CHROME_INSTALLER_SETUP_INSTALL_H_
9 9
10 #include <base/values.h> 10 #include <base/values.h>
(...skipping 19 matching lines...) Expand all
30 // and unpacked Chrome package. 30 // and unpacked Chrome package.
31 // prefs: master preferences. See chrome/installer/util/master_preferences.h. 31 // prefs: master preferences. See chrome/installer/util/master_preferences.h.
32 // new_version: new Chrome version that needs to be installed 32 // new_version: new Chrome version that needs to be installed
33 // installed_version: currently installed version of Chrome, if any, or 33 // installed_version: currently installed version of Chrome, if any, or
34 // NULL otherwise 34 // NULL otherwise
35 // 35 //
36 // Note: since caller unpacks Chrome to install_temp_path\source, the caller 36 // Note: since caller unpacks Chrome to install_temp_path\source, the caller
37 // is responsible for cleaning up install_temp_path. 37 // is responsible for cleaning up install_temp_path.
38 installer_util::InstallStatus InstallOrUpdateChrome( 38 installer_util::InstallStatus InstallOrUpdateChrome(
39 const std::wstring& exe_path, const std::wstring& archive_path, 39 const std::wstring& exe_path, const std::wstring& archive_path,
40 const std::wstring& install_temp_path, const DictionaryValue* prefs, 40 const std::wstring& install_temp_path, const std::wstring& prefs_path,
41 const Version& new_version, const Version* installed_version); 41 const DictionaryValue* prefs, const Version& new_version,
42 const Version* installed_version);
42 43
43 // This function installs a new version of Chrome to the specified location. 44 // This function installs a new version of Chrome to the specified location.
44 // It returns true if install was successful and false in case of an error. 45 // It returns true if install was successful and false in case of an error.
45 // 46 //
46 // exe_path: Path to the executable (setup.exe) as it will be copied 47 // exe_path: Path to the executable (setup.exe) as it will be copied
47 // to Chrome install folder after install is complete 48 // to Chrome install folder after install is complete
48 // archive_path: Path to the archive (chrome.7z) as it will be copied 49 // archive_path: Path to the archive (chrome.7z) as it will be copied
49 // to Chrome install folder after install is complete 50 // to Chrome install folder after install is complete
50 // src_path: the path that contains a complete and unpacked Chrome package 51 // src_path: the path that contains a complete and unpacked Chrome package
51 // to be installed. 52 // to be installed.
(...skipping 16 matching lines...) Expand all
68 const std::wstring& archive_path, 69 const std::wstring& archive_path,
69 const std::wstring& src_path, 70 const std::wstring& src_path,
70 const std::wstring& install_path, 71 const std::wstring& install_path,
71 const std::wstring& temp_dir, 72 const std::wstring& temp_dir,
72 const HKEY reg_root, 73 const HKEY reg_root,
73 const Version& new_version); 74 const Version& new_version);
74 75
75 } 76 }
76 77
77 #endif // CHROME_INSTALLER_SETUP_INSTALL_H_ 78 #endif // CHROME_INSTALLER_SETUP_INSTALL_H_
OLDNEW
« no previous file with comments | « chrome/browser/first_run_win.cc ('k') | chrome/installer/setup/install.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698