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

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

Issue 4342001: Refactoring the master_preferences functions.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/first_run/first_run.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 #pragma once 9 #pragma once
10 10
11 #include <string> 11 #include <string>
12 12
13 #include "chrome/installer/util/master_preferences.h"
13 #include "chrome/installer/util/util_constants.h" 14 #include "chrome/installer/util/util_constants.h"
14 #include "chrome/installer/util/version.h" 15 #include "chrome/installer/util/version.h"
15 16
16 class DictionaryValue; 17 class DictionaryValue;
17 18
18 namespace installer { 19 namespace installer {
19 // Get path to the installer under Chrome version folder 20 // Get path to the installer under Chrome version folder
20 // (for example <path>\Google\Chrome\<Version>\installer) 21 // (for example <path>\Google\Chrome\<Version>\installer)
21 std::wstring GetInstallerPathUnderChrome(const std::wstring& install_path, 22 std::wstring GetInstallerPathUnderChrome(const std::wstring& install_path,
22 const std::wstring& new_version); 23 const std::wstring& new_version);
(...skipping 11 matching lines...) Expand all
34 // prefs: master preferences. See chrome/installer/util/master_preferences.h. 35 // prefs: master preferences. See chrome/installer/util/master_preferences.h.
35 // new_version: new Chrome version that needs to be installed 36 // new_version: new Chrome version that needs to be installed
36 // installed_version: currently installed version of Chrome, if any, or 37 // installed_version: currently installed version of Chrome, if any, or
37 // NULL otherwise 38 // NULL otherwise
38 // 39 //
39 // Note: since caller unpacks Chrome to install_temp_path\source, the caller 40 // Note: since caller unpacks Chrome to install_temp_path\source, the caller
40 // is responsible for cleaning up install_temp_path. 41 // is responsible for cleaning up install_temp_path.
41 installer_util::InstallStatus InstallOrUpdateChrome( 42 installer_util::InstallStatus InstallOrUpdateChrome(
42 const std::wstring& exe_path, const std::wstring& archive_path, 43 const std::wstring& exe_path, const std::wstring& archive_path,
43 const std::wstring& install_temp_path, const std::wstring& prefs_path, 44 const std::wstring& install_temp_path, const std::wstring& prefs_path,
44 const DictionaryValue* prefs, const Version& new_version, 45 const installer_util::MasterPreferences& prefs, const Version& new_version,
45 const Version* installed_version); 46 const Version* installed_version);
46 } 47 }
47 48
48 #endif // CHROME_INSTALLER_SETUP_INSTALL_H_ 49 #endif // CHROME_INSTALLER_SETUP_INSTALL_H_
OLDNEW
« no previous file with comments | « chrome/browser/first_run/first_run.cc ('k') | chrome/installer/setup/install.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698